Thread: [Abtlinux-svn] SF.net SVN: abtlinux: [494] src/trunk (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 494
          http://abtlinux.svn.sourceforge.net/abtlinux/?rev=494&view=rev
Author:   eschabell
Date:     2008-01-28 07:39:29 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
Removed an old feature to show patches (from arch as repo idea time). Furthermore, added solution to running abt -h as non-root user, failing on missing logging permissions.

Modified Paths:
--------------
    src/trunk/abt.rb
    src/trunk/libs/abtusage.rb

Modified: src/trunk/abt.rb
===================================================================

--- src/trunk/abt.rb	2008-01-28 10:00:50 UTC (rev 493)
+++ src/trunk/abt.rb	2008-01-28 15:39:29 UTC (rev 494)
@@ -83,15 +83,16 @@
    system("svn export #{$ABTLINUX_MAIN_CONFIG} #{configfile}")
 	end
 
+	# should be installed, load config.
+	$LOAD_PATH.unshift "#{$DEFAULT_PREFIX}/etc/abt/"
+	load 'abtconfig.rb'
+
 	if File.exist?("#{$DEFAULT_PREFIX}/etc/abt/local/localconfig.rb")
 		$LOAD_PATH.unshift maxconfigpath
 		load 'localconfig.rb'
 	end
 end
 
-# should be installed, load config.
-$LOAD_PATH.unshift "#{$DEFAULT_PREFIX}/etc/abt/"
-load 'abtconfig.rb'
 
 # Check for missing default packages path, if needed install them.
 #	
@@ -111,6 +112,23 @@
   system("svn --force export #{$ABTLINUX_PACKAGES} #{$PACKAGE_PATH}")
 end
 
+# Chick for missing logging paths, if needed install them.
+#
+if (!File.directory?($ABT_LOGS) || (Dir.entries($ABT_LOGS) - ['.', '..']).empty?)
+	puts "\nMissing our main logging directory at #{$ABT_LOGS}"
+  puts "Maybe time for an abt update? Let us try to fix it for you!"
+
+	# check for root login.	
+	if (Process.uid != 0)
+  	puts "\nMust be root to fix missing logging paths."
+		exit
+	else
+		initializeAllAbtlinuxPaths = AbtLogManager.new
+    puts "\nCreated missing logging paths: #{$ABT_LOGS} and other general paths."
+		puts "\n\n"
+  end
+end
+   
 ##
 # Setup needed classes and get ready to parse arguments.
 ##
@@ -120,12 +138,7 @@
 system     = AbtSystemManager.new
 options    = Hash.new
 show       = AbtUsage.new
-myLogger   = AbtLogManager.new # initializes all ABT directories if missing.
 
-# setup timestamp.
-logger     = Logger.new($JOURNAL)     # initializes all needed paths.
-logger.datetime_format = "%Y-%m-%d %H:%M:%S "
-
 # deal with usage request.
 if (ARGV.length == 0 || (ARGV.length == 1 && (ARGV[0] == '--help' || ARGV[0] == '-h'  || ARGV[0].downcase == 'help')))
   show.usage("all")
@@ -135,6 +148,14 @@
 # login as root for the rest.
 manager.root_login(ARGV)
 
+# this initializes all needed ABT directories if missing.
+myLogger   = AbtLogManager.new
+
+# setup timestamp.
+logger     = Logger.new($JOURNAL)     # initializes all needed paths.
+logger.datetime_format = "%Y-%m-%d %H:%M:%S "
+
+
 # And loading local file if found.
 if File.exist?("#{$DEFAULT_PREFIX}/etc/abt/local/localconfig.rb")
   load "#{$DEFAULT_PREFIX}/etc/abt/local/localconfig.rb"
@@ -456,11 +477,6 @@
 when "show-iqueue"
   reporter.show_queue("install")
   
-when "show-patches"
-  # FIXME : show patches implementation.
-  puts "Display currently available patches for installed package tree."
-  show.usage("queries")
-  
 when "show-updates"
   # FIXME : show updates implementation.
   puts "Display package listing with available update versions."

Modified: src/trunk/libs/abtusage.rb
===================================================================
--- src/trunk/libs/abtusage.rb	2008-01-28 10:00:50 UTC (rev 493)
+++ src/trunk/libs/abtusage.rb	2008-01-28 15:39:29 UTC (rev 494)
@@ -107,7 +107,6 @@
     puts "  show-untracked\t\t\tShow all files on system not tracked by AbTLinux."
     puts "  show-journal\t\t\t\tShow the system journal."
     puts "  show-iqueue\t\t\t\tShow the contents of the install queue."
-    puts "  show-patches\t\t\t\tShow the current available patches for installed package tree.\n"
   end
 
   ##


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




Thread: [Abtlinux-svn] SF.net SVN: abtlinux: [494] src/trunk (Page 7)

abtlinux-svn