[Abtlinux-svn] SF.net SVN: abtlinux: [444] src/trunk

[<esc...@us...>]

Revision: 444
          http://abtlinux.svn.sourceforge.net/abtlinux/?rev=444&view=rev
Author:   eschabell
Date:     2007-12-26 01:06:20 -0800 (Wed, 26 Dec 2007)

Log Message:
-----------
Refactored reinstall package call to check for frozen before asking to reinstall the package, simplifies output paths.

Modified Paths:
--------------
    src/trunk/abt.rb
    src/trunk/abtpackagemanager.rb

Modified: src/trunk/abt.rb
===================================================================
--- src/trunk/abt.rb	2007-12-25 14:10:46 UTC (rev 443)
+++ src/trunk/abt.rb	2007-12-26 09:06:20 UTC (rev 444)
@@ -97,37 +97,13 @@
     options['package'] = ARGV[1]
     logger.info( "Starting to reinstall #{options['package']}" )
     
-    # check if already installed.
-    if ( system.package_installed( options['package'] ) )
-      puts "\n*** Package #{options['package']} is already installed! ***\n"
-      puts "Are you sure you want to proceed with a reinstall? (y/n)"
-      
-      while answer = STDIN.gets
-        answer.chomp!
-        if answer == "y"
-          break
-        elsif answer == "n"
-          exit
-        else 
-          puts "Are you sure you want to reinstall #{options['package']}? (y/n)"
-        end
-      end
-    else
-      puts "\n*** Package #{options['package']} is not installed, we will install it for you now! ***\n"
-      puts "Hit enter to continue..."
-      while continue = STDIN.gets
-        continue.chomp!
-        break
-      end
-    end
-    
-    if ( manager.reinstall_package( options['package'] ) )
+   if ( manager.reinstall_package( options['package'] ) )
       puts "\n\n"
       puts "*** Completed reinstall of #{options['package']}. ***"
       puts "\n\n"
       logger.info( "Completed reinstall of #{options['package']}." )
     else
-      puts "*** #{options['package'].capitalize} reinstall failed, see journal. ***"
+      puts "\n*** Unable to reinstall package #{options['package'].capitalize}, see why in the journal. ***"
     end    
   else
     show.usage( "packages" )
@@ -145,7 +121,7 @@
       puts "\n\n"
       puts "*** No need to remove #{options['package']}, it was not installed! ***"
       puts "\n\n"
-      logger.info( "Completed removal of #{options['package']}." )
+    	logger.info( "Unabel to complete removal of #{options['package']}." )
       exit
     end
 
@@ -154,9 +130,14 @@
       puts "\n\n"
       puts "*** Completed removal of #{options['package']}. ***"
       puts "\n\n"
-      logger.info( "Completed removal of #{options['package']}." )
+    	logger.info( "Unabel to complete removal of #{options['package']}." )
     end  
+    
+		puts "\n*** Unable to completed removal of #{options['package']}, see why in the journal. ***"
+    logger.info( "Unabel to complete removal of #{options['package']}." )
   else
+    puts "\n*** Unable to completed removal of #{options['package']}, see why in the journal. ***"
+    logger.info( "Unabel to complete removal of #{options['package']}." )
     show.usage( "packages" )
     exit
   end

Modified: src/trunk/abtpackagemanager.rb
===================================================================
--- src/trunk/abtpackagemanager.rb	2007-12-25 14:10:46 UTC (rev 443)
+++ src/trunk/abtpackagemanager.rb	2007-12-26 09:06:20 UTC (rev 444)
@@ -231,6 +231,30 @@
 			return false
 		end
 
+		# check if already installed.
+    if ( system.package_installed( options['package'] ) )
+      puts "\n*** Package #{package} is already installed! ***\n"
+      puts "Are you sure you want to proceed with a reinstall? (y/n)"
+      
+      while answer = STDIN.gets
+        answer.chomp!
+        if answer == "y"
+          break
+        elsif answer == "n"
+          exit
+        else 
+          puts "Are you sure you want to reinstall #{package}? (y/n)"
+        end
+      end
+    else
+      puts "\n*** Package #{package} is not installed, we will install it for you now! ***\n"
+      puts "Hit enter to continue..."
+      while continue = STDIN.gets
+        continue.chomp!
+        break
+      end
+    end
+ 
     if ( install_package( package ) )
       puts "\n\n"
       puts "*** Completed reinstall of #{package}. ***"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.