[yum-commits] package-cleanup.py

[skvidal at osuosl.org]

 package-cleanup.py |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit db72305dd64ed102b6f5fca2732f2a15bdb74a1a
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 12 11:58:50 2009 -0400

    add --noscripts option to package-cleanup since so much of our cleanup is related
    to dainbramaged scriptlets

diff --git a/package-cleanup.py b/package-cleanup.py
index e7ec7fd..4d19a87 100755
--- a/package-cleanup.py
+++ b/package-cleanup.py
@@ -65,17 +65,23 @@ class PackageCleanup(YumUtilBase):
                     action="store",
                     default='%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}',
                     help="Query format to use for output.")
-        self.optparser_grp.add_option("--dupes", default=False, 
-                    dest="dupes", action="store_true",
-                    help='Scan for duplicates in your rpmdb')
-        self.optparser_grp.add_option("--cleandupes", default=False, 
-                    dest="cleandupes", action="store_true",
-                    help='Scan for duplicates in your rpmdb and remove older ')
         self.optparser_grp.add_option("--orphans", default=False, 
                     dest="orphans",action="store_true",
                     help='List installed packages which are not available from'\
                          ' currenly configured repositories')
 
+        dupegrp = OptionGroup(self.optparser, 'Duplicate Package Options')
+        dupegrp.add_option("--dupes", default=False, 
+                    dest="dupes", action="store_true",
+                    help='Scan for duplicates in your rpmdb')
+        dupegrp.add_option("--cleandupes", default=False, 
+                    dest="cleandupes", action="store_true",
+                    help='Scan for duplicates in your rpmdb and remove older ')
+        dupegrp.add_option("--noscripts", default=False,
+                    dest="noscripts", action="store_true",
+                    help="disable rpm scriptlets from running when cleaning duplicates")
+        self.optparser.add_option_group(dupegrp)
+        
         leafgrp = OptionGroup(self.optparser, 'Leaf Node Options')
         leafgrp.add_option("--leaves", default=False, dest="leaves",
                     action="store_true",
@@ -360,7 +366,8 @@ class PackageCleanup(YumUtilBase):
             if os.geteuid() != 0:
                 print "Error: Cannot remove packages as a user, must be root"
                 sys.exit(1)
-        
+            if opts.noscripts:
+                self.conf.tsflags.append('noscripts')
             self._remove_old_dupes()
             self.buildTransaction()
             if len(self.tsInfo) < 1: