yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkglistgen: solv_merge(): skip when inputs are older than merged.

Browse Source
This commit is contained in:
Jimmy Berry 2018-02-15 09:28:33 -06:00
parent a11192affd
commit 45e788d5d5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkglistgen.py
View File

@ -784,6 +784,13 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
self.solv_merge(solv_file, solv_file_nonfree, solv_file_merged)
def solv_merge(self, solv1, solv2, solv_merged):
if os.path.exists(solv_merged):
modified = map(os.path.getmtime, [solv1, solv2, solv_merged])
if max(modified) <= modified[2]:
# The two inputs were modified before or at the same as merged.
logger.debug('merge skipped for {}'.format(solv_merged))
return
with open(solv_merged, 'w') as handle:
p = subprocess.Popen(['mergesolv', solv1, solv2], stdout=handle)
p.communicate()