Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-02-06 08:46:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix merge files for slack repository

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2020-01-15 23:40:15 +01:00
parent 6c09177ea5
commit 95b53cc51c
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
slpkg/init.py
View file

@ -137,14 +137,11 @@ class Initialization:
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,
FILELIST_TXT, repo_name) FILELIST_TXT, repo_name)
merge = self.merge_stable self.merge(lib, "PACKAGES.TXT", ["core/PACKAGES.TXT",
if self.meta.slack_rel == "current":
merge = self.merge_current
merge(lib, "PACKAGES.TXT", ["core/PACKAGES.TXT",
"extra/PACKAGES.TXT", "extra/PACKAGES.TXT",
"pasture/PACKAGES.TXT", "pasture/PACKAGES.TXT",
"patches/PACKAGES.TXT"]) "patches/PACKAGES.TXT"])
merge(lib, "CHECKSUMS.md5", ["core/CHECKSUMS.md5", self.merge(lib, "CHECKSUMS.md5", ["core/CHECKSUMS.md5",
"extra/CHECKSUMS.md5", "extra/CHECKSUMS.md5",
"pasture/CHECKSUMS.md5", "pasture/CHECKSUMS.md5",
"patches/CHECKSUMS_md5"]) "patches/CHECKSUMS_md5"])
@ -685,23 +682,13 @@ class Initialization:
self.down(lib_path, FILELIST_TXT, repo) self.down(lib_path, FILELIST_TXT, repo)
self.down(log_path, ChangeLog_txt, repo) self.down(log_path, ChangeLog_txt, repo)
def merge_stable(self, path, outfile, infiles): def merge(self, path, outfile, infiles):
"""Merge files
"""
with open(path + outfile, 'w') as out_f:
for i in infiles:
if os.path.isfile(f"{path}{i}"):
with open(path + i, "r") as in_f:
for line in in_f:
out_f.write(line)
def merge_current(self, path, outfile, infiles):
"""Merge files """Merge files
""" """
code = "utf-8" code = "utf-8"
with open(path + outfile, 'w', encoding=code) as out_f: with open(path + outfile, 'w', encoding=code) as out_f:
for f in infiles: for f in infiles:
if os.path.isfile("f{path}{f}"): if os.path.isfile(f"{path}{f}"):
# checking the encoding before read the file # checking the encoding before read the file
code = Utils.check_encoding(path, f) code = Utils.check_encoding(path, f)
with open(path + f, "r", encoding=code) as in_f: with open(path + f, "r", encoding=code) as in_f: