1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff -urN catalyst-2.0_rc1.orig/catalyst catalyst-2.0_rc1/catalyst
--- catalyst-2.0_rc1.orig/catalyst 2005-10-17 16:07:14.000000000 -0400
+++ catalyst-2.0_rc1/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:
|
GitWeb
