Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-18 10:26:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix: no "Pasture" directory on any mirrors #39

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-08-13 16:21:02 +03:00
parent 50ad9658ba
commit 12c92113f5
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
slpkg/init.py
View file

@ -120,10 +120,11 @@ class Initialization(object):
if self.check: if self.check:
return self.checks_logs(log, ChangeLog_txt) return self.checks_logs(log, ChangeLog_txt)
self.down(lib + dirs[0], PACKAGES_TXT, repo_name) self.down(lib + dirs[0], PACKAGES_TXT, repo_name)
self.down(lib + dirs[1], self.EXTRA, repo_name)
self.down(lib + dirs[2], self.PASTURE, repo_name)
self.down(lib + dirs[0], CHECKSUMS_MD5, repo_name) self.down(lib + dirs[0], CHECKSUMS_MD5, repo_name)
self.down(lib + dirs[1], self.EXTRA, repo_name)
self.down(lib + dirs[1], self.EXT_CHECKSUMS, repo_name) self.down(lib + dirs[1], self.EXT_CHECKSUMS, repo_name)
if slack_ver() != "14.0": # no pasture/ folder for 14.0 version
self.down(lib + dirs[2], self.PASTURE, repo_name)
self.down(lib + dirs[2], self.PAS_CHECKSUMS, repo_name) self.down(lib + dirs[2], self.PAS_CHECKSUMS, repo_name)
self.down(log, ChangeLog_txt, repo_name) self.down(log, ChangeLog_txt, repo_name)
self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5, self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5,
@ -585,8 +586,7 @@ class Initialization(object):
FILELIST_TXT = args[5] FILELIST_TXT = args[5]
repo = args[6] repo = args[6]
check = self.checks_logs(log_path, ChangeLog_txt) if self.checks_logs(log_path, ChangeLog_txt):
if check == 1:
# remove old files # remove old files
self.file_remove(log_path, ChangeLog_txt.split("/")[-1]) self.file_remove(log_path, ChangeLog_txt.split("/")[-1])
self.file_remove(lib_path, PACKAGES_TXT.split("/")[-1]) self.file_remove(lib_path, PACKAGES_TXT.split("/")[-1])
@ -600,21 +600,23 @@ class Initialization(object):
self.down(lib_path + "core/", PACKAGES_TXT, repo) self.down(lib_path + "core/", PACKAGES_TXT, repo)
self.down(lib_path + "core/", CHECKSUMS_MD5, repo) self.down(lib_path + "core/", CHECKSUMS_MD5, repo)
self.down(lib_path + "extra/", self.EXTRA, repo) self.down(lib_path + "extra/", self.EXTRA, repo)
self.down(lib_path + "pasture/", self.PASTURE, repo)
self.down(lib_path + "extra/", self.EXT_CHECKSUMS, repo) self.down(lib_path + "extra/", self.EXT_CHECKSUMS, repo)
if slack_ver() != "14.0": # no pasture/ folder for 14.0 version
self.down(lib_path + "pasture/", self.PASTURE, repo)
self.down(lib_path + "pasture/", self.PAS_CHECKSUMS, repo) self.down(lib_path + "pasture/", self.PAS_CHECKSUMS, repo)
# download new files # download new files
self.down(log_path, ChangeLog_txt, repo)
if repo != "slack": if repo != "slack":
self.down(lib_path, PACKAGES_TXT, repo) self.down(lib_path, PACKAGES_TXT, repo)
self.down(lib_path, CHECKSUMS_MD5, repo) self.down(lib_path, CHECKSUMS_MD5, repo)
self.down(lib_path, FILELIST_TXT, repo) self.down(lib_path, FILELIST_TXT, repo)
self.down(log_path, ChangeLog_txt, repo)
def merge(self, path, outfile, infiles): def merge(self, path, outfile, infiles):
"""Merge files """Merge files
""" """
with open(path + outfile, 'w') as out_f: with open(path + outfile, 'w') as out_f:
for i in infiles: for i in infiles:
if os.path.isfile("{0}{1}".format(path, i)):
with open(path + i, "r") as in_f: with open(path + i, "r") as in_f:
for line in in_f: for line in in_f:
out_f.write(line) out_f.write(line)
@ -634,8 +636,8 @@ class Initialization(object):
if os.path.isfile(log_path + filename): if os.path.isfile(log_path + filename):
local = FileSize(log_path + filename).local() local = FileSize(log_path + filename).local()
if server != local: if server != local:
return 1 return True
return 0 return False
def upgrade(self, only): def upgrade(self, only):
"""Remove all package lists with changelog and checksums files """Remove all package lists with changelog and checksums files