Changeset 154 for trunk

Timestamp:

04/27/09 11:50:14 (14 years ago)

Author:

bas

Message:

closes #9

Location:

trunk

Files:

• Changelog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• src/pxeconfig.py.in (modified) (1 diff)

trunk/Changelog

@@ +1 @@
+3.0.2:
+  * If option remove is specified, then do not ask for configuration file,
+    closses #9
+    Reporter: Ramon Bastiaans (SARA)
+    Author  : Bas van der Vlies
+
 3.0.1:
   * Import AdvancedParser instead of sara location.

trunk/debian/changelog

@@ +1 @@
+pxeconfig (3.0.2-1) stable; urgency=low
+
+  * If option remove is specified, then do not ask for configuration file, closses #9
+    Reporter: Ramon Bastiaans (SARA)
+    Author  : Bas van der Vlies
+
+
+ -- Bas van der Vlies <basv@sara.nl>  Mon, 27 Apr 2009 11:48:30 +0200
+
 pxeconfig (3.0.1-1) stable; urgency=low
 

trunk/src/pxeconfig.py.in

@@ -305 +305 @@
                         pass
 
-        if options.filename:
-                if not os.path.isfile(os.path.join(PXE_CONF_DIR, options.filename)):
+        if not options.REMOVE:
+                if options.filename:
+                        if not os.path.isfile(os.path.join(PXE_CONF_DIR, options.filename)):
                                 error =  '%s: Filename does not exists' %(options.filename)
                                 raise PxeConfig, error
-        else:
-                options.filename = select_pxe_configfile() 
+                else:
+                        options.filename = select_pxe_configfile() 
 
         if options.DEBUG: