[yum-commits] Branch 'yum-3_2_X' - 2 commits - docs/yum.8 docs/yum.conf.5 rpmUtils/updates.py yum/config.py

[James Antill]

 docs/yum.8          |    4 +++-
 docs/yum.conf.5     |    1 +
 rpmUtils/updates.py |    1 +
 yum/config.py       |    2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 196b60ad3874325f5034880acb4176b278bd92ad
Author: James Antill <james at and.org>
Date:   Thu Dec 4 19:01:33 2008 -0500

    Change the default for obsoletes to be true, and tweaks docs.

diff --git a/docs/yum.8 b/docs/yum.8
index 641899d..e31ce0f 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -87,7 +87,8 @@ will ensure that all dependencies are satisfied\&.  If no package
 matches the given package name(s), they are assumed to be a shell glob
 and any matches are then installed\&. 
 
-If the \-\-obsoletes flag is present \fByum\fP will include package 
+If the main obsoletes configure option is true (default) or the \-\-obsoletes
+flag is present \fByum\fP will include package 
 obsoletes in its calculations - this makes it better for distro\-version 
 changes, for example: upgrading from somelinux 8.0 to somelinux 9.
 .IP 
@@ -97,6 +98,7 @@ be applied without running it interactively. Returns exit value of 100 if
 there are packages available for an update. Also returns a list of the pkgs
 to be updated in list format. Returns 0 if no packages are available for
 update. Returns 1 if an error occured.
+Running in verbose mode also shows obsoletes.
 .IP
 .IP "\fBupgrade\fP"
 Is the same as the update command with the \-\-obsoletes flag set. See update 
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 901f6b4..15462b7 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -124,6 +124,7 @@ Default is `0'.
 This option only has affect during an \fBupdate\fR. It enables yum's
 obsoletes processing logic. Useful when doing distribution level upgrades. See
 also the yum \fBupgrade\fR command documentation for more details (yum(8)).
+Default is `true'.
 .br
 Command-line option: \fB\-\-obsoletes\fP
 
diff --git a/yum/config.py b/yum/config.py
index ffd70b3..2219605 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -637,7 +637,7 @@ class YumConf(StartupConf):
     # FIXME: rename gpgcheck to pkgs_gpgcheck
     gpgcheck = BoolOption(__pkgs_gpgcheck_default__)
     repo_gpgcheck = BoolOption(__repo_gpgcheck_default__)
-    obsoletes = BoolOption(False)
+    obsoletes = BoolOption(True)
     showdupesfromrepos = BoolOption(False)
     enabled = BoolOption(True)
     enablegroups = BoolOption(True)
commit a59165490ebc236f7682ebc157bf069497958b42
Author: James Antill <james at and.org>
Date:   Thu Dec 4 18:58:59 2008 -0500

    Always have an obsoletes dict, so we can always call getObsoletesTuples() etc.

diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index f348ae9..16f733b 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -54,6 +54,7 @@ class Updates:
         self.updating_dict = {}
         #debug, ignore me
         self.debug = 0
+        self.obsoletes = {}
 
     def _delFromDict(self, dict_, keys, value):
         for key in keys: