|
 |
5e9bef |
diff -up yum-3.4.3/yum/__init__.py.orig yum-3.4.3/yum/__init__.py
|
|
|
5e9bef |
--- yum-3.4.3/yum/__init__.py.orig 2019-03-27 16:56:28.012138396 +0100
|
|
|
5e9bef |
+++ yum-3.4.3/yum/__init__.py 2019-03-27 16:58:37.176809731 +0100
|
|
|
5e9bef |
@@ -6890,24 +6890,24 @@ much more problems).
|
|
|
5e9bef |
|
|
|
5e9bef |
self._ts_save_file = filename
|
|
|
5e9bef |
|
|
|
5e9bef |
- msg = "%s\n" % self.rpmdb.simpleVersion(main_only=True)[0]
|
|
|
5e9bef |
- msg += "%s\n" % self.ts.getTsFlags()
|
|
|
5e9bef |
+ msg = ["%s\n" % self.rpmdb.simpleVersion(main_only=True)[0],
|
|
|
5e9bef |
+ "%s\n" % self.ts.getTsFlags()]
|
|
|
5e9bef |
|
|
|
5e9bef |
if self.tsInfo._pkgSack is None: # Transactions have pkgSack?
|
|
|
5e9bef |
- msg += "1\n"
|
|
|
5e9bef |
+ msg += ["1\n"]
|
|
|
5e9bef |
else:
|
|
|
5e9bef |
- msg += "%s\n" % (len(self.repos.listEnabled()) + 1)
|
|
|
5e9bef |
+ msg += ["%s\n" % (len(self.repos.listEnabled()) + 1)]
|
|
|
5e9bef |
for r in self.repos.listEnabled():
|
|
|
5e9bef |
- msg += "%s:%s:%s\n" % (r.id, len(r.sack), r.repoXML.revision)
|
|
|
5e9bef |
+ msg += ["%s:%s:%s\n" % (r.id, len(r.sack), r.repoXML.revision)]
|
|
|
5e9bef |
|
|
|
5e9bef |
# Save what we think the future rpmdbv will be.
|
|
|
5e9bef |
- msg += "%s:%s\n" % ('installed', self.tsInfo.futureRpmDBVersion())
|
|
|
5e9bef |
+ msg += ["%s:%s\n" % ('installed', self.tsInfo.futureRpmDBVersion())]
|
|
|
5e9bef |
|
|
|
5e9bef |
- msg += "%s\n" % len(self.tsInfo.getMembers())
|
|
|
5e9bef |
+ msg += ["%s\n" % len(self.tsInfo.getMembers())]
|
|
|
5e9bef |
for txmbr in self.tsInfo.getMembers():
|
|
|
5e9bef |
- msg += txmbr._dump()
|
|
|
5e9bef |
+ msg += [txmbr._dump()]
|
|
|
5e9bef |
try:
|
|
|
5e9bef |
- f.write(msg)
|
|
|
5e9bef |
+ f.write(''.join(msg))
|
|
|
5e9bef |
f.close()
|
|
|
5e9bef |
except (IOError, OSError), e:
|
|
|
5e9bef |
self._ts_save_file = None
|
|
|
5e9bef |
diff -up yum-3.4.3/yum/transactioninfo.py.orig yum-3.4.3/yum/transactioninfo.py
|
|
|
5e9bef |
--- yum-3.4.3/yum/transactioninfo.py.orig 2019-03-27 16:55:57.905748837 +0100
|
|
|
5e9bef |
+++ yum-3.4.3/yum/transactioninfo.py 2019-03-27 16:58:37.178809757 +0100
|
|
|
5e9bef |
@@ -873,44 +873,47 @@ class TransactionMember:
|
|
|
5e9bef |
return "<%s : %s (%s)>" % (self.__class__.__name__, str(self),hex(id(self)))
|
|
|
5e9bef |
|
|
|
5e9bef |
def _dump(self):
|
|
|
5e9bef |
- msg = "mbr: %s,%s,%s,%s,%s %s\n" % (self.name, self.arch, self.epoch,
|
|
|
5e9bef |
- self.version, self.release, self.current_state)
|
|
|
5e9bef |
- msg += " repo: %s\n" % self.po.repo.id
|
|
|
5e9bef |
- msg += " ts_state: %s\n" % self.ts_state
|
|
|
5e9bef |
- msg += " output_state: %s\n" % self.output_state
|
|
|
5e9bef |
- msg += " isDep: %s\n" % bool(self.isDep)
|
|
|
5e9bef |
- msg += " reason: %s\n" % self.reason
|
|
|
5e9bef |
- #msg += " process: %s\n" % self.process
|
|
|
5e9bef |
- msg += " reinstall: %s\n" % bool(self.reinstall)
|
|
|
5e9bef |
+ msg = ["mbr: %s,%s,%s,%s,%s %s\n" %
|
|
|
5e9bef |
+ (self.name, self.arch, self.epoch, self.version, self.release,
|
|
|
5e9bef |
+ self.current_state),
|
|
|
5e9bef |
+ " repo: %s\n" % self.po.repo.id,
|
|
|
5e9bef |
+ " ts_state: %s\n" % self.ts_state,
|
|
|
5e9bef |
+ " output_state: %s\n" % self.output_state,
|
|
|
5e9bef |
+ " isDep: %s\n" % bool(self.isDep),
|
|
|
5e9bef |
+ " reason: %s\n" % self.reason,
|
|
|
5e9bef |
+ # " process: %s\n" % self.process,
|
|
|
5e9bef |
+ " reinstall: %s\n" % bool(self.reinstall)]
|
|
|
5e9bef |
|
|
|
5e9bef |
if self.relatedto:
|
|
|
5e9bef |
- msg += " relatedto:"
|
|
|
5e9bef |
+ msg += [" relatedto:"]
|
|
|
5e9bef |
for (po, rel) in self.relatedto:
|
|
|
5e9bef |
pkgorigin = 'a'
|
|
|
5e9bef |
if isinstance(po, YumInstalledPackage):
|
|
|
5e9bef |
pkgorigin = 'i'
|
|
|
5e9bef |
- msg += " %s,%s,%s,%s,%s@%s:%s" % (po.name, po.arch, po.epoch,
|
|
|
5e9bef |
- po.version, po.release, pkgorigin, rel)
|
|
|
5e9bef |
- msg += "\n"
|
|
|
5e9bef |
+ msg += [" %s,%s,%s,%s,%s@%s:%s" %
|
|
|
5e9bef |
+ (po.name, po.arch, po.epoch, po.version, po.release,
|
|
|
5e9bef |
+ pkgorigin, rel)]
|
|
|
5e9bef |
+ msg += ["\n"]
|
|
|
5e9bef |
|
|
|
5e9bef |
for lst in ['depends_on', 'obsoletes', 'obsoleted_by', 'downgrades',
|
|
|
5e9bef |
'downgraded_by', 'updates', 'updated_by']:
|
|
|
5e9bef |
thislist = getattr(self, lst)
|
|
|
5e9bef |
if thislist:
|
|
|
5e9bef |
- msg += " %s:" % lst
|
|
|
5e9bef |
+ msg += [" %s:" % lst]
|
|
|
5e9bef |
for po in thislist:
|
|
|
5e9bef |
pkgorigin = 'a'
|
|
|
5e9bef |
if isinstance(po, YumInstalledPackage):
|
|
|
5e9bef |
pkgorigin = 'i'
|
|
|
5e9bef |
- msg += " %s,%s,%s,%s,%s@%s" % (po.name, po.arch, po.epoch,
|
|
|
5e9bef |
- po.version, po.release, pkgorigin)
|
|
|
5e9bef |
- msg += "\n"
|
|
|
5e9bef |
+ msg += [" %s,%s,%s,%s,%s@%s" %
|
|
|
5e9bef |
+ (po.name, po.arch, po.epoch, po.version,
|
|
|
5e9bef |
+ po.release, pkgorigin)]
|
|
|
5e9bef |
+ msg += ["\n"]
|
|
|
5e9bef |
|
|
|
5e9bef |
if self.groups:
|
|
|
5e9bef |
- msg += " groups: %s\n" % ' '.join(self.groups)
|
|
|
5e9bef |
+ msg += [" groups: %s\n" % ' '.join(self.groups)]
|
|
|
5e9bef |
if self.environments:
|
|
|
5e9bef |
- msg += " environments: %s\n" % ' '.join(self.environments)
|
|
|
5e9bef |
+ msg += [" environments: %s\n" % ' '.join(self.environments)]
|
|
|
5e9bef |
if self.repopkg:
|
|
|
5e9bef |
- msg += " repopkg: %s\n" % self.repopkg
|
|
|
5e9bef |
+ msg += [" repopkg: %s\n" % self.repopkg]
|
|
|
5e9bef |
|
|
|
5e9bef |
- return msg
|
|
|
5e9bef |
+ return ''.join(msg)
|