kadischi/lib functions.py,1.2,1.3
Jasper O'neal Hartline (autopsy)
fedora-extras-commits at redhat.com
Fri Mar 10 21:46:37 UTC 2006
- Previous message (by thread): owners owners.list,1.730,1.731
- Next message (by thread): rpms/perl-Mail-SPF-Query/devel .cvsignore, 1.2, 1.3 perl-Mail-SPF-Query.spec, 1.2, 1.3 sources, 1.2, 1.3 use-sys-hostname.patch, 1.1, 1.2 MSQ-fallback.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: autopsy
Update of /cvs/devel/kadischi/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9170/kadischi/lib
Modified Files:
functions.py
Log Message:
Commit for bug #169812 and #178623 (functions.py)
Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- functions.py 28 Aug 2005 10:20:17 -0000 1.2
+++ functions.py 10 Mar 2006 21:46:35 -0000 1.3
@@ -6,6 +6,10 @@
import rpm
import urlgrabber.grabber as grabber
+# Import isys for get_kernel_version()
+sys.path.append("/usr/lib/anaconda")
+import isys
+
def normalize_path (parts, rootpath = None):
if rootpath == None:
rootpath = '/'
@@ -65,9 +69,21 @@
kernel_version = None
clear_rpm_db_files (rootdir)
ts = rpm.TransactionSet (rootdir)
- for mi in ts.dbMatch ('name', 'kernel'):
- kernel_version = "%s-%s" % (mi['version'], mi['release'])
- clear_rpm_db_files (rootdir)
+ while kernel_version == None:
+ if isys.smpAvailable() or isys.htavailable():
+ for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'):
+ kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor'
+ clear_rpm_db_files (rootdir)
+ for mi in ts.dbMatch ('name', 'kernel-smp'):
+ kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+ clear_rpm_db_files (rootdir)
+ else:
+ for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'):
+ kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor'
+ clear_rpm_db_files (rootdir)
+ for mi in ts.dbMatch ('name', 'kernel'):
+ kernel_version = "%s-%s" % (mi['version'], mi['release'])
+ clear_rpm_db_files (rootdir)
return kernel_version
def clean_directory (dir, remove_when_done=True, keep_child_directories=False):
@@ -116,4 +132,4 @@
flc_log ('Done.')
else:
flc_log ('You should clean temporary files.')
- sys.exit (1)
\ No newline at end of file
+ sys.exit (1)
- Previous message (by thread): owners owners.list,1.730,1.731
- Next message (by thread): rpms/perl-Mail-SPF-Query/devel .cvsignore, 1.2, 1.3 perl-Mail-SPF-Query.spec, 1.2, 1.3 sources, 1.2, 1.3 use-sys-hostname.patch, 1.1, 1.2 MSQ-fallback.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list