diff --git a/msys.py b/msys.py index ca6533a..f88c6a1 100644 --- a/msys.py +++ b/msys.py @@ -2,5 +2,6 @@ ARCHIVE = '.tar.xz' ARCHITECTURES = ['x86_64', 'i686'] CATALOG = '.files' CHARSET = 'u8' +DISTRIBUTION = 'distrib' SIGNATURE = '.sig' SUBSYSTEMS = ['msys', 'clang', 'mingw', 'ucrt'] diff --git a/remote.py b/remote.py index b5b3370..e90fe6e 100644 --- a/remote.py +++ b/remote.py @@ -15,7 +15,6 @@ ARCHITECTURES_SUBSYSTEMS = { 'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'], 'i686': ['msys', 'clang32', 'mingw32'], } -DISTRIBUTION = 'distrib' MINGW = 'mingw' @@ -30,7 +29,8 @@ class Remote: a = {} c = {} for architecture in self.architectures: - location = os.path.join(self.location, DISTRIBUTION, architecture) + location = os.path.join(self.location, + msys.DISTRIBUTION, architecture) a[architecture] = hypertext.HyperText(location).archive # c[architecture] = {} diff --git a/repository.py b/repository.py index 61b8e1d..998739b 100644 --- a/repository.py +++ b/repository.py @@ -3,7 +3,6 @@ import datetime import os import msys -import remote class Repository: @@ -14,7 +13,7 @@ class Repository: def load(self): distribution = os.path.join( - self.directory, remote.DISTRIBUTION) + self.directory, msys.DISTRIBUTION) d = {} _, architectures, _ = next(os.walk(distribution)) for architecture in [a for a in architectures