[yum-commits] 5 commits - Makefile yum/depsolve.py yum/drpm.py

[James Antill]

 Makefile        |    8 ++++----
 yum/depsolve.py |    8 ++++++++
 yum/drpm.py     |    3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 9940be5cb1a92a69aaf3887aeb6e49dfc7581b63
Author: James Antill <james at and.org>
Date:   Thu Feb 28 13:45:43 2013 -0500

    Provide getDiscNum() for DeltaPackage class. BZ 916675.

diff --git a/yum/drpm.py b/yum/drpm.py
index 3339107..9c1629f 100644
--- a/yum/drpm.py
+++ b/yum/drpm.py
@@ -49,6 +49,9 @@ class DeltaPackage:
     def localPkg(self):
         return self.localpath
 
+    def getDiscNum(self):
+        return None
+
     def verifyLocalPkg(self):
         # check file size first
         try: fsize = os.path.getsize(self.localpath)
commit 1aedad5f1ecb4dee854074d7c51aa79f44e3f031
Merge: 513d5b8 b76d26f
Author: James Antill <james at and.org>
Date:   Thu Feb 28 11:31:08 2013 -0500

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum: (14 commits)
      Obsolete yum-presto plugin
      ...

commit 513d5b8f1472f8b3df5f02aec5fe7fd2d7308277
Author: James Antill <james at and.org>
Date:   Wed Feb 27 15:16:12 2013 -0500

    Quick workaround for stupid ruby self obsoletes problems.

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 90e1253..500a0b9 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -910,10 +910,18 @@ class Depsolve(object):
                         for otxmbr in self.tsInfo.matchNaevr(name=obs_n):
                             if otxmbr.output_state not in TS_INSTALL_STATES:
                                 continue
+                            if otxmbr.po == txmbr.po:
+                                #  Not sure if we should just ignore this for
+                                # us, or for everyone...
+                                continue
                             if otxmbr.po.obsoletedBy([txmbr.po]):
                                 if txmbr.po.obsoletedBy([otxmbr.po]):
                                     # Have to deal with loops!
                                     continue
+                                # No callback?
+                                msg = _('Removing %s due to obsoletes from %s')
+                                self.verbose_logger.log(logginglevels.DEBUG_1,
+                                                        msg, otxmbr, txmbr)
                                 self.tsInfo.remove(otxmbr.pkgtup)
                                 #  We need to remove an obsoleted entry that
                                 # was maybe used to resolve something ... ?
commit 5dfdf1eb08f4b82d6aabefe0ee170064f673e0be
Merge: be9f66c d2c8207
Author: James Antill <james at and.org>
Date:   Wed Feb 27 13:12:16 2013 -0500

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Man page syntax and spelling fixes.

commit be9f66c7984b001cfa0f5aaae52f79d45d8c6222
Author: James Antill <james at and.org>
Date:   Mon Feb 25 14:25:29 2013 -0500

    Fix transifex auto-commit-message typos.

diff --git a/Makefile b/Makefile
index e15a3f8..a1c0c0f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,18 +45,18 @@ apidocs:
 
 transifex-pull:
 	tx pull -a -f
-	@echo "You can now git commit -a -m 'Transfix pull, *.po update'"
+	@echo "You can now git commit -a -m 'Transifex pull, *.po update'"
 
 transifex-push:
 	make -C po yum.pot
 	tx push -s -t
-	@echo "You can now git commit -a -m 'Transfix push, yum.pot update'"
+	@echo "You can now git commit -a -m 'Transifex push, yum.pot update'"
 
 transifex:
 	make transifex-pull
-	git commit -a -m 'Transfix pull, *.po update'
+	git commit -a -m 'Transefex pull, *.po update'
 	make transifex-push
-	git commit -a -m 'Transfix push, yum.pot update'
+	git commit -a -m 'Transifex push, yum.pot update'
 
 .PHONY: docs test