kadischi/livecd_generator kadischi.py,1.54,1.55

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14812/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
Minor changes to keep wording proper.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kadischi.py	28 Feb 2007 13:00:57 -0000	1.54
+++ kadischi.py	28 Feb 2007 13:03:42 -0000	1.55
@@ -33,18 +33,18 @@
 
     global builddir, postscriptdir, buildstamp, isoimage
 
-    # check for Requires
-    print "[kadischi]: Checking dependencies for Kadischi"
+    # check for required packages
+    print "[kadischi]: Checking requirements for Kadischi"
     requirements()
 
     # checking UID - must be root
-    print "[kadischi]: Checking UID for root access"
+    print "[kadischi]: Checking UID"
     if os.getuid() != 0:
         print >> sys.stderr, "[kadischi]: You must be root to build a live CD."
         sys.exit(1)
 
     # OK, we're starting
-    print "[kadischi]: Starting kadischi with root access..."
+    print "[kadischi]: Starting kadischi as UID 0..."
 
     ### Check for Grub or Isolinux configuration 
     bootloader = None
@@ -342,7 +342,7 @@
 
 
 def method_check(method):
-    '''def exists(url):
+    def exists(url):
         try:
             u = grabber.urlopen(url, retry=5)
             u.close()
@@ -351,7 +351,7 @@
         except grabber.URLGrabError, e:
             print "[kadischi]: Repository validation failed. Aborting execution."
             logging.debug("[kadischi]: Unable to find %s: %s" %(url, e))
-            return False'''
+            return False
 
     if method.startswith("http://") or method.startswith("ftp://") or method.find(":") == -1:
         if not exists("%s/repodata/repomd.xml" %(method,)):