[yum-commits] docs/yum.conf.5 rpmUtils/transaction.py yum/depsolve.py

[Panu Matilainen]

 docs/yum.conf.5         |    3 ++-
 rpmUtils/transaction.py |    3 ++-
 yum/depsolve.py         |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4eda59196a09e0bff7c9b99ef61098b77794e79d
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Fri Apr 26 09:15:39 2013 +0300

    Enable inode problem filtering too on diskspacecheck=0
    
    Inode problems are much rarer than diskspace issues, more likely to
    occur on strange file systems than by actually running out of inodes.
    This makes diskspacecheck=0 behave the same as rpm's --ignoresize
    option.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 15aaa06..66129bd 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -293,7 +293,8 @@ provides this manually by using: "yum whatprovides redhat-release".
 .IP
 \fBdiskspacecheck\fR
 Either `0' or `1'. Set this to `0' to disable the checking for sufficient
-diskspace before a RPM transaction is run. Default is `1' (perform the check).
+diskspace and inodes before a RPM transaction is run. Default is `1'
+(perform the check).
 
 .IP
 \fBtsflags\fR
diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
index 121ad5b..778ed2d 100644
--- a/rpmUtils/transaction.py
+++ b/rpmUtils/transaction.py
@@ -114,7 +114,8 @@ class TransactionWrapper:
         # FIXME GARBAGE - remove once this is reimplemented elsehwere
         # KEEPING FOR API COMPLIANCE ONLY
         if conf.get('diskspacecheck') == 0:
-            self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE)
+            self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE|
+                                  rpm.RPMPROB_FILTER_DISKNODES)
         tserrors = self.ts.run(cb.callback, '')
         self.ts.setFlags(origflags)
     
diff --git a/yum/depsolve.py b/yum/depsolve.py
index d274782..52b751b 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -200,7 +200,8 @@ class Depsolve(object):
                 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
 
         if not self.conf.diskspacecheck:
-            self._add_prob_flags(rpm.RPMPROB_FILTER_DISKSPACE)
+            self._add_prob_flags(rpm.RPMPROB_FILTER_DISKSPACE,
+                                 rpm.RPMPROB_FILTER_DISKNODES)
 
         probfilter = 0
         for flag in self.tsInfo.probFilterFlags: