diff --git a/src/loaih/__init__.py b/src/loaih/__init__.py index 7b733b0..4f15c3b 100644 --- a/src/loaih/__init__.py +++ b/src/loaih/__init__.py @@ -134,7 +134,7 @@ class Solver(): retval.query = self.text retval.branch = self.branch retval.version = self.version - if retval.branch != 'daily': + if retval.branch != 'daily' and retval.branch != 'prerelease': retval.urls['x86_64'] = self.baseurl + 'x86_64/' try: @@ -234,6 +234,8 @@ class NamedSolver(Solver): fullversion: str = str(archived_versions[-1]) self.baseurl = ARCHIVE + fullversion + 'deb/' self.version = fullversion.rstrip('/') + if self.branch == 'prerelease': + self.baseurl = PRERELEASE return self.version diff --git a/src/loaih/build.py b/src/loaih/build.py index 77f8f97..30657d8 100644 --- a/src/loaih/build.py +++ b/src/loaih/build.py @@ -217,7 +217,7 @@ class Build(): self.found = True # Identifying downloads - self.tarballs = [ x for x in loaih.match_xpath(self.url, "//td/a/text()") if x.endswith('tar.gz') and 'deb' in x ] + self.tarballs = [ x for x in loaih.match_xpath(self.url, "//td/a/text()") if x.endswith('tar.gz') and 'deb' in x and self.version.version in x ] self.download_tarballs = [] @@ -654,7 +654,7 @@ class Build(): ), cwd=temporary, check=True) if self.debug: - with open(os.path.abspath(os.builddir, 'dependencies.lst'), 'w', encoding="utf-8") as deplist: + with open(os.path.abspath(os.storage_path, 'dependencies.lst'), 'w', encoding="utf-8") as deplist: deplist.write("\n".join(debs)) def __finalize_build__(self): diff --git a/src/loaih/version.py b/src/loaih/version.py index 271bf7c..59c1d9a 100644 --- a/src/loaih/version.py +++ b/src/loaih/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python3 # encoding: utf-8 -version = "1.3.3" +version = "1.4.0rc0"