added the progress bars back

1 files changed, 6 insertions, 10 deletions

diff --git a/fstab.py b/fstab.py
index 16922d46e..b15235d14 100644
--- a/fstab.py
+++ b/fstab.py
@@ -489,11 +489,8 @@ class Fstab:
 		if swaps.has_key(file): continue
 		
 		if not os.access(file, os.R_OK):
-#		    isys.ddfile(file, size, (progressWindow, _("Swap Space"),
-#				      _("Creating swap space...")))
-
-		    isys.ddfile(file, size)
-
+		    isys.ddfile(file, size, (progressWindow, _("Swap Space"),
+				      _("Creating swap space...")))
 
 		    iutil.execWithRedirect ("/usr/sbin/mkswap", 
 				  [ "mkswap", '-v1', file ],
@@ -507,18 +504,17 @@ class Fstab:
 		isys.makeDevInode(device, file)
 
 	    if formatThisSwap:
-# bfox - add these commented out lines back in at some point and make it work with GUI mode
-#		w = self.waitWindow(_("Formatting"),
-#			      _("Formatting swap space..."))
+		w = self.waitWindow(_("Formatting"),
+			      _("Formatting swap space..."))
 
 		rc = iutil.execWithRedirect ("/usr/sbin/mkswap",
 					 [ "mkswap", '-v1', file ],
 					 stdout = None, stderr = None,
 					 searchPath = 1)
-#		w.pop()
+		w.pop()
 
 		if rc:
-#		    self.messageWindow(_("Error"), _("Error creating swap on device ") + file)
+		    self.messageWindow(_("Error"), _("Error creating swap on device ") + file)
 		    raise ValueError
 		else:
 		    isys.swapon (file)