[Uludag-commits] r16985 - branches/pisi-devel/pisi

[uludag-commits at pardus.org.tr]

Author: faik
Date: Tue Feb  5 14:22:05 2008
New Revision: 16985

Modified:
   branches/pisi-devel/pisi/atomicoperations.py
Log:
Merge downgrading bug from trunk



Modified: branches/pisi-devel/pisi/atomicoperations.py
=================================================================
--- branches/pisi-devel/pisi/atomicoperations.py	(original)
+++ branches/pisi-devel/pisi/atomicoperations.py	Tue Feb  5 14:22:05 2008
@@ -230,7 +230,7 @@
                     self.operation = UPGRADE
 
                 # is this a downgrade? confirm this action.
-                if self.ask_reinstall and (not self.operation == UPGRADE):
+                if not self.operation == UPGRADE:
                     if pisi.version.Version(pkg.version) < pisi.version.Version(iversion):
                         #x = _('Downgrade to old upstream version?')
                         x = None
@@ -238,7 +238,7 @@
                         x = _('Downgrade to old distribution release?')
                     else:
                         x = _('Downgrade to old distribution build?')
-                    if x and not ctx.ui.confirm(x):
+                    if self.ask_reinstall and x and not ctx.ui.confirm(x):
                         raise Error(_('Package downgrade declined'))
                     self.operation = DOWNGRADE