]>
Commit | Line | Data |
---|---|---|
c2f22095 AM |
1 | --- anaconda/Makefile.inc.org 2007-02-20 21:29:51.230623000 +0100 |
2 | +++ anaconda/Makefile.inc 2007-02-20 21:30:25.302623000 +0100 | |
322a3102 ER |
3 | @@ -1,8 +1,8 @@ |
4 | # | |
5 | # define destination locations | |
6 | # | |
7 | -PYTHONLIBDIR = /usr/lib/anaconda | |
8 | -RUNTIMEDIR = /usr/lib/anaconda-runtime | |
9 | +PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda | |
10 | +RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime | |
11 | ANACONDADATADIR = /usr/share/anaconda | |
c2f22095 AM |
12 | PYVER := $(shell python -c 'import sys; print sys.version[0:3]') |
13 | PYTHON = python$(PYVER) | |
14 | diff -ur anaconda-11.2.0.24/anaconda anaconda-11.2.0.24/anaconda | |
15 | --- anaconda-11.2.0.24/anaconda 2007-02-01 23:55:38.000000000 +0100 | |
16 | +++ anaconda-11.2.0.24/anaconda 2007-02-20 18:15:06.726623000 +0100 | |
8da9d5b1 PZ |
17 | @@ -358,19 +358,19 @@ |
18 | break | |
19 | ||
20 | if haveUpdates: | |
21 | - sys.path.insert(ndx+1, '/usr/lib/anaconda') | |
22 | - sys.path.insert(ndx+2, '/usr/lib/anaconda/textw') | |
23 | - sys.path.insert(ndx+3, '/usr/lib/anaconda/iw') | |
24 | + sys.path.insert(ndx+1, '/usr/%s/anaconda' % sys.lib) | |
25 | + sys.path.insert(ndx+2, '/usr/%s/anaconda/textw' % sys.lib) | |
26 | + sys.path.insert(ndx+3, '/usr/%s/anaconda/iw' % sys.lib) | |
27 | else: | |
28 | - sys.path.insert(0, '/usr/lib/anaconda') | |
29 | - sys.path.insert(1, '/usr/lib/anaconda/textw') | |
30 | - sys.path.insert(2, '/usr/lib/anaconda/iw') | |
31 | + sys.path.insert(0, '/usr/%s/anaconda' % sys.lib) | |
32 | + sys.path.insert(1, '/usr/%s/anaconda/textw' % sys.lib) | |
33 | + sys.path.insert(2, '/usr/%s/anaconda/iw' % sys.lib) | |
c2f22095 AM |
34 | |
35 | if (os.path.exists('booty')): | |
36 | sys.path.append('booty') | |
37 | sys.path.append('booty/edd') | |
38 | else: | |
39 | - sys.path.append('/usr/lib/booty') | |
40 | + sys.path.append('/usr/%s/booty' % sys.lib) | |
41 | ||
42 | sys.path.append('/usr/share/system-config-date') | |
43 | ||
8da9d5b1 PZ |
44 | @@ -446,7 +446,7 @@ |
45 | child = os.fork() | |
c2f22095 | 46 | if child == 0: |
8da9d5b1 | 47 | for p in ('/tmp/updates/pyrc.py', \ |
c2f22095 AM |
48 | - '/usr/lib/anaconda-runtime/pyrc.py'): |
49 | + '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib): | |
50 | if os.access(p, os.R_OK|os.X_OK): | |
51 | os.environ['PYTHONSTARTUP'] = p | |
52 | break | |
53 | diff -ur anaconda-11.2.0.24/command-stubs/list-harddrives-stub anaconda-11.2.0.24/command-stubs/list-harddrives-stub | |
54 | --- anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2006-06-22 19:18:11.000000000 +0200 | |
55 | +++ anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2007-02-20 18:19:21.454623000 +0100 | |
56 | @@ -10,7 +10,7 @@ | |
57 | if (os.path.exists('isys')): | |
58 | sys.path.append('isys') | |
bcf777dd ER |
59 | |
60 | -sys.path.append('/usr/lib/anaconda') | |
61 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
62 | ||
c2f22095 AM |
63 | import anaconda_log |
64 | import parted | |
65 | diff -ur anaconda-11.2.0.24/command-stubs/loadkeys-stub anaconda-11.2.0.24/command-stubs/loadkeys-stub | |
66 | --- anaconda-11.2.0.24/command-stubs/loadkeys-stub 2004-05-11 23:52:00.000000000 +0200 | |
67 | +++ anaconda-11.2.0.24/command-stubs/loadkeys-stub 2007-02-20 18:18:48.482623000 +0100 | |
bcf777dd ER |
68 | @@ -7,7 +7,7 @@ |
69 | if (os.path.exists('isys')): | |
70 | sys.path.append('isys') | |
71 | ||
72 | -sys.path.append('/usr/lib/anaconda') | |
73 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
74 | ||
75 | import isys | |
76 | ||
c2f22095 AM |
77 | diff -ur anaconda-11.2.0.24/command-stubs/losetup-stub anaconda-11.2.0.24/command-stubs/losetup-stub |
78 | --- anaconda-11.2.0.24/command-stubs/losetup-stub 2001-02-20 20:48:12.000000000 +0100 | |
79 | +++ anaconda-11.2.0.24/command-stubs/losetup-stub 2007-02-20 18:19:53.858623000 +0100 | |
bcf777dd ER |
80 | @@ -7,7 +7,7 @@ |
81 | if (os.path.exists('isys')): | |
82 | sys.path.append('isys') | |
83 | ||
84 | -sys.path.append('/usr/lib/anaconda') | |
85 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
86 | ||
87 | import isys | |
88 | from sys import argv | |
c2f22095 AM |
89 | diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-stubs/mknod-stub |
90 | --- anaconda-11.2.0.24/command-stubs/mknod-stub 2006-07-31 22:40:00.000000000 +0200 | |
91 | +++ anaconda-11.2.0.24/command-stubs/mknod-stub 2007-02-20 18:20:05.686623000 +0100 | |
92 | @@ -1,7 +1,7 @@ | |
93 | #!/usr/bin/python | |
94 | ||
95 | import sys, os | |
96 | -sys.path.append('/usr/lib/anaconda') | |
97 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
98 | import isys | |
99 | import string | |
100 | import stat | |
c2f22095 AM |
101 | diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub |
102 | --- anaconda-11.2.0.24/command-stubs/raidstart-stub 2006-03-28 18:49:14.000000000 +0200 | |
103 | +++ anaconda-11.2.0.24/command-stubs/raidstart-stub 2007-02-20 18:19:36.002623000 +0100 | |
bcf777dd ER |
104 | @@ -12,7 +12,7 @@ |
105 | sys.path.append('gnome-map') | |
106 | sys.path.append('isys') | |
107 | ||
108 | -sys.path.append('/usr/lib/anaconda') | |
109 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
110 | ||
c2f22095 | 111 | import anaconda_log |
bcf777dd | 112 | import fsset |
c2f22095 AM |
113 | diff -ur anaconda-11.2.0.24/command-stubs/raidstop-stub anaconda-11.2.0.24/command-stubs/raidstop-stub |
114 | --- anaconda-11.2.0.24/command-stubs/raidstop-stub 2006-03-28 18:49:14.000000000 +0200 | |
115 | +++ anaconda-11.2.0.24/command-stubs/raidstop-stub 2007-02-20 18:20:21.294623000 +0100 | |
116 | @@ -12,7 +12,7 @@ | |
117 | sys.path.append('gnome-map') | |
bcf777dd ER |
118 | sys.path.append('isys') |
119 | ||
120 | -sys.path.append('/usr/lib/anaconda') | |
121 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
122 | ||
c2f22095 AM |
123 | import anaconda_log |
124 | import fsset | |
125 | diff -ur anaconda-11.2.0.24/command-stubs/syslogd-stub anaconda-11.2.0.24/command-stubs/syslogd-stub | |
126 | --- anaconda-11.2.0.24/command-stubs/syslogd-stub 2006-05-01 18:39:15.000000000 +0200 | |
127 | +++ anaconda-11.2.0.24/command-stubs/syslogd-stub 2007-02-20 18:20:40.322623000 +0100 | |
bcf777dd ER |
128 | @@ -1,7 +1,7 @@ |
129 | #!/usr/bin/python | |
130 | ||
131 | import sys | |
132 | -sys.path.append('/usr/lib/anaconda') | |
133 | +sys.path.append('/usr/%s/anaconda' % sys.lib) | |
bcf777dd | 134 | |
c2f22095 AM |
135 | def usage(): |
136 | sys.stderr.write("syslogd [root] [output file]") | |
137 | diff -ur anaconda-11.2.0.24/installclass.py anaconda-11.2.0.24/installclass.py | |
138 | --- anaconda-11.2.0.24/installclass.py 2007-02-06 17:14:43.000000000 +0100 | |
139 | +++ anaconda-11.2.0.24/installclass.py 2007-02-20 18:09:46.158623000 +0100 | |
140 | @@ -485,7 +485,7 @@ | |
141 | elif os.access("/tmp/product/installclasses", os.R_OK): | |
142 | path = "/tmp/product/installclasses" | |
143 | else: | |
144 | - path = "/usr/lib/anaconda/installclasses" | |
145 | + path = "/usr/%s/anaconda/installclasses" % sys.lib | |
bcf777dd | 146 | |
c2f22095 AM |
147 | # append the location of installclasses to the python path so we |
148 | # can import them | |
149 | diff -ur anaconda-11.2.0.24/language.py anaconda-11.2.0.24/language.py | |
150 | --- anaconda-11.2.0.24/language.py 2006-10-10 19:18:09.000000000 +0200 | |
151 | +++ anaconda-11.2.0.24/language.py 2007-02-20 18:09:46.158623000 +0100 | |
152 | @@ -21,6 +21,7 @@ | |
153 | from rhpl.simpleconfig import SimpleConfigFile | |
154 | ||
155 | import logging | |
156 | +import sys | |
157 | log = logging.getLogger("anaconda") | |
158 | ||
159 | # Converts a single language into a "language search path". For example, | |
160 | @@ -57,7 +58,7 @@ | |
161 | self.current = "en_US.UTF-8" | |
162 | ||
163 | # English name -> native name mapping | |
164 | - search = ('lang-names', '/usr/lib/anaconda/lang-names') | |
165 | + search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib)) | |
166 | for path in search: | |
167 | if os.access(path, os.R_OK): | |
168 | f = open(path, 'r') | |
169 | @@ -72,7 +73,7 @@ | |
8da9d5b1 | 170 | |
c2f22095 | 171 | # nick -> (name, short name, font, keyboard, timezone) mapping |
8da9d5b1 | 172 | search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table', |
c2f22095 AM |
173 | - '/usr/lib/anaconda/lang-table') |
174 | + '/usr/%s/anaconda/lang-table' % sys.lib) | |
175 | for path in search: | |
176 | if os.access(path, os.R_OK): | |
177 | f = open(path, "r") | |
178 | diff -ur anaconda-11.2.0.24/loader2/loader.c anaconda-11.2.0.24/loader2/loader.c | |
179 | --- anaconda-11.2.0.24/loader2/loader.c 2007-02-13 17:52:22.000000000 +0100 | |
180 | +++ anaconda-11.2.0.24/loader2/loader.c 2007-02-20 18:17:47.146623000 +0100 | |
181 | @@ -300,6 +300,8 @@ | |
182 | setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1); | |
183 | else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK)) | |
184 | setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1); | |
185 | + else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK)) | |
186 | + setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1); | |
187 | setenv("LD_LIBRARY_PATH", LIBPATH, 1); | |
188 | setenv("LANG", "C", 1); | |
189 |