From 4795d7ef79613f5667863c230cd5a1a4d78bbc45 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 1 Jul 2015 22:59:36 +0300 Subject: [PATCH] Fixed alien -current repository #24 --- slpkg/binary/repo_init.py | 6 +++++- slpkg/init.py | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/slpkg/binary/repo_init.py b/slpkg/binary/repo_init.py index a59e3995..b6f87ba1 100644 --- a/slpkg/binary/repo_init.py +++ b/slpkg/binary/repo_init.py @@ -62,10 +62,14 @@ class RepoInit(object): self.mirror = "{0}{1}/".format(Repo().rlw(), slack_ver()) def _init_alien(self): + ver = slack_ver() arch = "x86" if os.uname()[4] == "x86_64": arch = "x86_64" - self.mirror = "{0}{1}/{2}/".format(Repo().alien(), slack_ver(), arch) + if self.meta.slack_rel == "current": + ver = self.meta.slack_rel + self.mirror = "{0}{1}/{2}/".format(Repo().alien(), ver, arch) + print self.meta.slack_rel, ver, self.mirror def _init_slacky(self): arch = "" diff --git a/slpkg/init.py b/slpkg/init.py index 44503066..79a42ae7 100644 --- a/slpkg/init.py +++ b/slpkg/init.py @@ -177,6 +177,7 @@ class Initialization(object): """Creating alien local library """ ar = "x86" + ver = slack_ver() arch = os.uname()[4] repo = Repo().alien() log = self.log_path + "alien/" @@ -191,10 +192,11 @@ class Initialization(object): os.mkdir(lib) if arch == "x86_64": ar = arch - PACKAGES_TXT = "{0}/{1}/{2}/{3}".format(repo, slack_ver(), ar, lib_file) + if self.meta.slack_rel == "current": + ver = self.meta.slack_rel + PACKAGES_TXT = "{0}/{1}/{2}/{3}".format(repo, ver, ar, lib_file) FILELIST_TXT = "" - CHECKSUMS_MD5 = "{0}/{1}/{2}/{3}".format(repo, slack_ver(), ar, - md5_file) + CHECKSUMS_MD5 = "{0}/{1}/{2}/{3}".format(repo, ver, ar, md5_file) ChangeLog_txt = "{0}{1}".format(repo, log_file) if self.check: return self.checks_logs(log, log_file, ChangeLog_txt)