Updated version stamp and added slot patch.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@870 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index b19972cc66daabd77fd974d459265fce4f0a26af..88ee67a97accb0279f8dfcb7a2cb81b7eca1ad19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.361 2005/10/26 15:42:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.362 2005/11/01 22:36:23 wolf31o2 Exp $
+
+  01 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +catalyst-2.0_pre20051101-slot.patch, catalyst:
+  Updated version stamp and added slot patch.
 
   26 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/netboot_target.py:
   Fix ordering problem so self.settings is defined

diff --git a/catalyst b/catalyst
index d4423c350e9456ff160767d629fb1708973cbc63..a126b93467a0592e3f7c955d63e045cc2f03b6bf 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.93 2005/10/20 14:12:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.94 2005/11/01 22:36:23 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_pre20051020"
+__version__="2.0_pre20051101"
 
 conf_values={}
 

diff --git a/catalyst-2.0_pre20051101-slot.patch b/catalyst-2.0_pre20051101-slot.patch
new file mode 100644 (file)
index 0000000..0391e52
--- /dev/null
+++ b/catalyst-2.0_pre20051101-slot.patch
@@ -0,0 +1,30 @@
+diff -urN catalyst-2.0_pre20051101.orig/catalyst catalyst-2.0_pre20051101/catalyst
+--- catalyst-2.0_pre20051101.orig/catalyst     2005-10-17 16:07:14.000000000 -0400
++++ catalyst-2.0_pre20051101/catalyst  2005-10-17 16:06:23.000000000 -0400
+@@ -50,10 +50,10 @@
+       myconf={}
+       config_file=""
+ 
+-      confdefaults={ "storedir":"/var/tmp/catalyst",\
+-              "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\
++      confdefaults={ "storedir":"/var/tmp/catalyst2",\
++              "sharedir":"/usr/share/catalyst2","distdir":"/usr/portage/distfiles",\
+               "portdir":"/usr/portage","options":"",\
+-              "snapshot_cache":"/var/tmp/catalyst/snapshot_cache" }
++              "snapshot_cache":"/var/tmp/catalyst2/snapshot_cache" }
+               
+       # first, try the one passed (presumably from the cmdline)
+       if myconfig:
+@@ -67,9 +67,9 @@
+                       sys.exit(1)
+       
+       # next, try the default location
+-      elif os.path.exists("/etc/catalyst/catalyst.conf"):
+-              print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf"
+-              config_file="/etc/catalyst/catalyst.conf"
++      elif os.path.exists("/etc/catalyst2/catalyst2.conf"):
++              print "Using default Catalyst configuration file, /etc/catalyst2/catalyst2.conf"
++              config_file="/etc/catalyst2/catalyst2.conf"
+       
+       # can't find a config file (we are screwed), so bail out
+       else: