upgradecheck upgradecheck.py,1.39,1.40 upgradecheckspam.py,1.6,1.7

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Include list of enabled repoids in report


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
+++ upgradecheck.py	16 Sep 2007 08:50:19 -0000	1.40
@@ -32,6 +32,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_to = "fedora-devel-list at redhat.com"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -240,7 +256,7 @@
         report.append('')
     report += oldreport
 
-    report = "\n".join(report)
+    report = report_header + "\n\n" + "\n".join(report)
     if report:
         if mail_to and not opts.nomail:
             msg = MIMEText(report)


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
+++ upgradecheckspam.py	16 Sep 2007 08:50:19 -0000	1.7
@@ -33,6 +33,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
 smtp_server = None
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -227,7 +243,7 @@
             s.connect()
 
     for owner,report in reports.iteritems():
-        mailbody = "\n".join(report)
+        mailbody = report_header + "\n\n" + "\n".join(report)
 
         if not opts.nomail:
             msg = MIMEText(mailbody)