Removing slot patch as it probably didn't belong here anyway, and updating version...

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

diff --git a/ChangeLog b/ChangeLog
index 51b8ccaf545bedb58ce3f4cc5e46bd59cf0bb610..f8df46fa636b59c2030e1183b931fbc94cfb9d35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.385 2005/11/18 02:25:44 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.386 2005/11/18 15:39:32 wolf31o2 Exp $
+
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-2.0_pre20051101-slot.patch, catalyst:
+  Removing slot patch as it probably didn't belong here anyway, and updating
+  version stamp to 2.0_pre20051118.
 
   18 Nov 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, modules/livecd_stage1_target.py,

diff --git a/catalyst b/catalyst
index c80fbb60dc5e2af425287a640d5d1650029aa2da..ee00509fc6e73567837be4434eea24b01d3f51d8 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.98 2005/11/17 22:04:26 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.99 2005/11/18 15:39:32 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_pre20051115"
+__version__="2.0_pre20051118"
 
 conf_values={}
 

diff --git a/catalyst-2.0_pre20051101-slot.patch b/catalyst-2.0_pre20051101-slot.patch
deleted file mode 100644 (file)
index 0391e52..0000000
--- a/catalyst-2.0_pre20051101-slot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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: