upgradecheck upgradecheck.py,1.38,1.39 upgradecheckspam.py,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1289

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Add option -T for disabling "testing" repos


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- upgradecheck.py	8 Sep 2007 17:21:09 -0000	1.38
+++ upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upgradecheckspam.py	8 Sep 2007 17:21:09 -0000	1.5
+++ upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()