[yum-commits] 2 commits - yum/drpm.py yum/transactioninfo.py

[zpavlas at osuosl.org]

 yum/drpm.py            |   11 ++++++-----
 yum/transactioninfo.py |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit fa2f724992bf53b6c20226751187730b66e9286f
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Tue Apr 16 09:15:44 2013 +0200

    rebuilding deltarpms: fix the callback==None case. BZ 952357

diff --git a/yum/drpm.py b/yum/drpm.py
index f9e2320..ae5a764 100644
--- a/yum/drpm.py
+++ b/yum/drpm.py
@@ -271,11 +271,12 @@ class DeltaInfo:
         if total:
             self.verbose_logger.info(_('Finishing delta rebuilds of %d package(s) (%s)'),
                                      count, progress.format_number(total))
-            if hasattr(progress, 'text_meter_total_size'):
-                progress.text_meter_total_size(0)
-            self.progress = po.repo.callback
-            self.progress.start(text='<locally rebuilding deltarpms>', size=total)
-            self.done = 0
+            if po.repo.callback:
+                if hasattr(progress, 'text_meter_total_size'):
+                    progress.text_meter_total_size(0)
+                self.progress = po.repo.callback
+                self.progress.start(text='<locally rebuilding deltarpms>', size=total)
+                self.done = 0
         while self._future_jobs:
             self.dequeue()
 
commit ae094fe6d90a2775a83a7635dbc06d2d0b09e5cb
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Apr 15 14:36:27 2013 +0200

    Fix the installed/depinstalled split.  BZ 952162
    
    User requested packages are not dep-installed/updated,
    even if they appear in dependency cycles.

diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 14d8c7a..57a6764 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -379,7 +379,7 @@ class TransactionData:
 
         for txmbr in self.getMembers():
             if txmbr.output_state == TS_UPDATE:
-                if txmbr.isDep:
+                if txmbr.isDep and txmbr.reason != 'user':
                     self.depupdated.append(txmbr)
                 else:
                     self.updated.append(txmbr)
@@ -401,7 +401,7 @@ class TransactionData:
                     for evg in txmbr.environments:
                         if evg not in self.instenvironments:
                             self.instenvironments.append(evg)
-                if txmbr.isDep:
+                if txmbr.isDep and txmbr.reason != 'user':
                     self.depinstalled.append(txmbr)
                 else:
                     self.installed.append(txmbr)