Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-03 06:56:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed alien -current repository #24

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-07-01 22:59:36 +03:00
parent c0a70263f0
commit 4795d7ef79
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
slpkg/binary/repo_init.py
View file

@ -62,10 +62,14 @@ class RepoInit(object):
self.mirror = "{0}{1}/".format(Repo().rlw(), slack_ver()) self.mirror = "{0}{1}/".format(Repo().rlw(), slack_ver())
def _init_alien(self): def _init_alien(self):
ver = slack_ver()
arch = "x86" arch = "x86"
if os.uname()[4] == "x86_64": if os.uname()[4] == "x86_64":
arch = "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): def _init_slacky(self):
arch = "" arch = ""

8
slpkg/init.py
View file

@ -177,6 +177,7 @@ class Initialization(object):
"""Creating alien local library """Creating alien local library
""" """
ar = "x86" ar = "x86"
ver = slack_ver()
arch = os.uname()[4] arch = os.uname()[4]
repo = Repo().alien() repo = Repo().alien()
log = self.log_path + "alien/" log = self.log_path + "alien/"
@ -191,10 +192,11 @@ class Initialization(object):
os.mkdir(lib) os.mkdir(lib)
if arch == "x86_64": if arch == "x86_64":
ar = arch 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 = "" FILELIST_TXT = ""
CHECKSUMS_MD5 = "{0}/{1}/{2}/{3}".format(repo, slack_ver(), ar, CHECKSUMS_MD5 = "{0}/{1}/{2}/{3}".format(repo, ver, ar, md5_file)
md5_file)
ChangeLog_txt = "{0}{1}".format(repo, log_file) ChangeLog_txt = "{0}{1}".format(repo, log_file)
if self.check: if self.check:
return self.checks_logs(log, log_file, ChangeLog_txt) return self.checks_logs(log, log_file, ChangeLog_txt)