Tentative fix for issue #5. Not thoroughly tested, though.
This commit is contained in:
parent
50e019262a
commit
31db0bf5e9
|
@ -134,7 +134,7 @@ class Solver():
|
||||||
retval.query = self.text
|
retval.query = self.text
|
||||||
retval.branch = self.branch
|
retval.branch = self.branch
|
||||||
retval.version = self.version
|
retval.version = self.version
|
||||||
if retval.branch != 'daily':
|
if retval.branch != 'daily' and retval.branch != 'prerelease':
|
||||||
retval.urls['x86_64'] = self.baseurl + 'x86_64/'
|
retval.urls['x86_64'] = self.baseurl + 'x86_64/'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -234,6 +234,8 @@ class NamedSolver(Solver):
|
||||||
fullversion: str = str(archived_versions[-1])
|
fullversion: str = str(archived_versions[-1])
|
||||||
self.baseurl = ARCHIVE + fullversion + 'deb/'
|
self.baseurl = ARCHIVE + fullversion + 'deb/'
|
||||||
self.version = fullversion.rstrip('/')
|
self.version = fullversion.rstrip('/')
|
||||||
|
if self.branch == 'prerelease':
|
||||||
|
self.baseurl = PRERELEASE
|
||||||
|
|
||||||
return self.version
|
return self.version
|
||||||
|
|
||||||
|
|
|
@ -217,7 +217,7 @@ class Build():
|
||||||
self.found = True
|
self.found = True
|
||||||
|
|
||||||
# Identifying downloads
|
# 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 = []
|
self.download_tarballs = []
|
||||||
|
|
||||||
|
@ -654,7 +654,7 @@ class Build():
|
||||||
), cwd=temporary, check=True)
|
), cwd=temporary, check=True)
|
||||||
|
|
||||||
if self.debug:
|
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))
|
deplist.write("\n".join(debs))
|
||||||
|
|
||||||
def __finalize_build__(self):
|
def __finalize_build__(self):
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
|
||||||
version = "1.3.3"
|
version = "1.4.0rc0"
|
||||||
|
|
Loading…
Reference in New Issue