[yum-commits] cli.py yum/depsolve.py

[Panu Matilainen]

 cli.py          |    2 --
 yum/depsolve.py |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 608420459abbce10e2ea0c8a08c93c89754a417a
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Fri Apr 26 08:27:21 2013 +0300

    Resurrect diskspacecheck=0 functionality
    
    Commit fc395ef14b135b3591488816ec902057fd8d03f4 broke the option
    to disable disk space checking, presumably because cli.py adds
    the filter flag to tsInfo.probFilterFlags, not the transaction
    set itself. With the intermediate transaction set creation now removed,
    initActionTs() doesn't get called again so nothing looks at the
    tsInfo.probFilterFlags at that point.  Moving it to initActionTs()
    where other similar initialization is done makes it more consistent
    and more importantly, resurrects the functionality.

diff --git a/cli.py b/cli.py
index e652a2f..173568f 100755
--- a/cli.py
+++ b/cli.py
@@ -661,8 +661,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         tt_st = time.time()            
         self.verbose_logger.log(yum.logginglevels.INFO_2,
             _('Running transaction test'))
-        if not self.conf.diskspacecheck:
-            self.tsInfo.probFilterFlags.append(rpm.RPMPROB_FILTER_DISKSPACE)
             
         self.ts.order() # order the transaction
         self.ts.clean() # release memory not needed beyond this point
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 60047a9..d274782 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -199,6 +199,9 @@ class Depsolve(object):
             else:
                 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
 
+        if not self.conf.diskspacecheck:
+            self._add_prob_flags(rpm.RPMPROB_FILTER_DISKSPACE)
+
         probfilter = 0
         for flag in self.tsInfo.probFilterFlags:
             probfilter |= flag