starlingx/root
Code Issues Proposed changes

Merge "debrepack.py: Fix mixed package log files and wrong place of "src_files""

Browse Source
This commit is contained in:
Zuul 2022-01-10 15:09:53 +00:00 committed by Gerrit Code Review
commit 098601f8ca
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build-tools/stx/debrepack.py
View File

@ -204,17 +204,6 @@ class Parser():
self.pkginfo["pkgpath"] = os.path.abspath(pkgpath) self.pkginfo["pkgpath"] = os.path.abspath(pkgpath)
self.pkginfo["pkgname"] = os.path.basename(pkgpath) self.pkginfo["pkgname"] = os.path.basename(pkgpath)
self.pkginfo["packdir"] = os.path.join(self.basedir, self.pkginfo["pkgname"]) self.pkginfo["packdir"] = os.path.join(self.basedir, self.pkginfo["pkgname"])
if os.path.exists(self.pkginfo["packdir"]):
shutil.rmtree(self.pkginfo["packdir"])
os.mkdir(self.pkginfo["packdir"])
logfile = os.path.join(self.pkginfo["packdir"], self.pkginfo["pkgname"] + ".log")
if os.path.exists(logfile):
os.remove(logfile)
logfile_handler = logging.FileHandler(logfile, 'w')
formatter = logging.Formatter('%(levelname)s - %(message)s')
logfile_handler.setFormatter(formatter)
self.logger.addHandler(logfile_handler)
self.pkginfo["debfolder"] = os.path.join(self.pkginfo["pkgpath"], "debian") self.pkginfo["debfolder"] = os.path.join(self.pkginfo["pkgpath"], "debian")
if not os.path.isdir(self.pkginfo["debfolder"]): if not os.path.isdir(self.pkginfo["debfolder"]):
@ -252,7 +241,7 @@ class Parser():
self.meta_data['src_files'] = [] self.meta_data['src_files'] = []
for src_file in src_files: for src_file in src_files:
src_path = os.path.expandvars(src_file) src_path = os.path.expandvars(src_file)
if not os.path.exists(src_path): if not os.path.isabs(src_path):
src_path = os.path.join(self.pkginfo["pkgpath"], src_file) src_path = os.path.join(self.pkginfo["pkgpath"], src_file)
if not os.path.exists(src_path): if not os.path.exists(src_path):
self.logger.error("No such file %s", src_path) self.logger.error("No such file %s", src_path)
@ -676,6 +665,19 @@ class Parser():
def package(self, pkgpath, mirror): def package(self, pkgpath, mirror):
self.setup(pkgpath) self.setup(pkgpath)
if os.path.exists(self.pkginfo["packdir"]):
shutil.rmtree(self.pkginfo["packdir"])
os.mkdir(self.pkginfo["packdir"])
logfile = os.path.join(self.pkginfo["packdir"], self.pkginfo["pkgname"] + ".log")
if os.path.exists(logfile):
os.remove(logfile)
logfile_handler = logging.FileHandler(logfile, 'w')
formatter = logging.Formatter('%(levelname)s - %(message)s')
logfile_handler.setFormatter(formatter)
self.logger.addHandler(logfile_handler)
if not os.path.exists(mirror): if not os.path.exists(mirror):
self.logger.error("No such %s directory", mirror) self.logger.error("No such %s directory", mirror)
raise ValueError(f"No such {mirror} directory") raise ValueError(f"No such {mirror} directory")
@ -727,4 +729,6 @@ class Parser():
source = os.path.join(self.pkginfo["packdir"], f) source = os.path.join(self.pkginfo["packdir"], f)
run_shell_cmd('cp -Lr %s %s' % (source, self.output), self.logger) run_shell_cmd('cp -Lr %s %s' % (source, self.output), self.logger)
self.logger.removeHandler(logfile_handler)
return files return files