Created
June 15, 2023 21:30
-
-
Save kallisti5/e0c90960c073b597ff46ba39b0f956e3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/HaikuPorter/Repository.py b/HaikuPorter/Repository.py | |
index 5eedb97..c8abb9d 100644 | |
--- a/HaikuPorter/Repository.py | |
+++ b/HaikuPorter/Repository.py | |
@@ -10,6 +10,7 @@ from .DependencyResolver import DependencyResolver | |
from .Options import getOption | |
from .Port import Port | |
from .Utils import prefixLines, sysExit, touchFile, versionCompare, warn | |
+from .Repositories import LocalRepository | |
import codecs | |
from functools import cmp_to_key | |
@@ -28,12 +29,11 @@ class Repository(object): | |
currentFormatVersion = 2 | |
- def __init__(self, treePath, outputDirectory, repositoryPath, | |
+ def __init__(self, treePath, outputDirectory, repositoryUri, | |
packagesPath, shellVariables, | |
policy, preserveFlags, quiet=False, verbose=False): | |
self.treePath = treePath | |
self.outputDirectory = outputDirectory | |
- self.path = repositoryPath | |
self.inputSourcePackagesPath \ | |
= self.outputDirectory + '/input-source-packages' | |
self.packagesPath = packagesPath | |
@@ -42,11 +42,20 @@ class Repository(object): | |
self.quiet = quiet | |
self.verbose = verbose | |
- self._formatVersionFilePath = self.path + '/.formatVersion' | |
- self._portIdForPackageIdFilePath \ | |
- = self.path + '/.portIdForPackageIdMap' | |
- self._portNameForPackageNameFilePath \ | |
- = self.path + '/.portNameForPackageNameMap' | |
+ #self.path = repositoryUri | |
+ self.repository = None | |
+ | |
+ if repositoryUri.startswith("file://") or repositoryUri.startswith("/"): | |
+ self.repository = LocalRepository(repositoryUri) | |
+ #elif repositoryUri.startswith("s3://"): | |
+ # self.repository = RemoteRepositoryS3(repositoryUri) | |
+ | |
+ if self.repository == None: | |
+ sysExit('Unknown repository location') | |
+ | |
+ self._formatVersionFilePath = '/.formatVersion' | |
+ self._portIdForPackageIdFilePath = '/.portIdForPackageIdMap' | |
+ self._portNameForPackageNameFilePath = '/.portNameForPackageNameMap' | |
# check repository format | |
formatVersion = self._readFormatVersion() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment