[svn] r5301 - trunk/tools/sarah

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-04-20 19:25:57 +0200 (Fri, 20 Apr 2007)
New Revision: 5301

Modified:
   trunk/tools/sarah/sarahdb.py
   trunk/tools/sarah/sarahinfo.py
   trunk/tools/sarah/sarahlib.py
   trunk/tools/sarah/sarahsql.py
Log:
Small updates for RHEL5.

Modified: trunk/tools/sarah/sarahdb.py
===================================================================
--- trunk/tools/sarah/sarahdb.py	2007-04-20 17:25:21 UTC (rev 5300)
+++ trunk/tools/sarah/sarahdb.py	2007-04-20 17:25:57 UTC (rev 5301)
@@ -52,7 +52,7 @@
 sarahlib.createtb(cur, 'rpm')
 sarahlib.createtb(cur, 'pro')
 
-filelist = glob.glob('advisories/RH?A-*.xml')
+filelist = glob.glob('advisories/RH?A-*.xml') + glob.glob('advisories.rhn/RH?A-*.xml')
 if filelist:
 	print 'Using %s advisories from: ./advisories/' % len(filelist)
 else:
@@ -122,6 +122,9 @@
 			if refrec['reftype'] == 'self':
 				refrec['refid'] = advrec['advid']
 				refrec['reference'] = refnode.text
+			elif refrec['reftype'] == 'external':
+				refrec['refid'] = advrec['advid']
+				refrec['reference'] = elattr(refnode, 'href')
 			elif refnode.findtext('advisory'):
 				refrec['refid'] = findel(refnode, 'advisory')
 				refrec['reference'] = elattr(refnode, 'href')
@@ -136,7 +139,7 @@
 				refrec['reference'] = elattr(refnode, 'href')
 			else:
 				refrec['refid'] = 'error'
-#				raise Exception, 'refid not found.'
+				raise Exception, 'refid not found for reftype %s.' % refrec['reftype']
 
 			refrec['summary'] = findel(refnode, 'summary', fail=False)
 

Modified: trunk/tools/sarah/sarahinfo.py
===================================================================
--- trunk/tools/sarah/sarahinfo.py	2007-04-20 17:25:21 UTC (rev 5300)
+++ trunk/tools/sarah/sarahinfo.py	2007-04-20 17:25:57 UTC (rev 5301)
@@ -63,6 +63,9 @@
 	elif key in ('4AS', '4ES', '4WS', '4Desktop'):
 		print '%s: %s  ' % (key, count[key]),
 		continue
+	elif key in ('5Server', '5Client', '5Desktop'):
+		print '%s: %s  ' % (key, count[key]),
+		continue
 	else:
 		c[i] += count[key]
 print 'Other (%s): %s\n  ' % (j, c[j]),

Modified: trunk/tools/sarah/sarahlib.py
===================================================================
--- trunk/tools/sarah/sarahlib.py	2007-04-20 17:25:21 UTC (rev 5300)
+++ trunk/tools/sarah/sarahlib.py	2007-04-20 17:25:57 UTC (rev 5301)
@@ -1,4 +1,5 @@
-import os, sqlite, types
+import os, types
+import sqlite
 
 dbase = 'sarahdb.sqlite'
 

Modified: trunk/tools/sarah/sarahsql.py
===================================================================
--- trunk/tools/sarah/sarahsql.py	2007-04-20 17:25:21 UTC (rev 5300)
+++ trunk/tools/sarah/sarahsql.py	2007-04-20 17:25:57 UTC (rev 5301)
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 
-import sys, os, sqlite, string
+import sys, os, string
+import sqlite
 import sarahlib
 
+
 sys.stdout = os.fdopen(1, 'w', 0)
 con, cur = sarahlib.opendb()