]> git.pld-linux.org Git - packages/anaconda.git/blame - anaconda-libdir.patch
projects / packages / anaconda.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated API
[packages/anaconda.git] / anaconda-libdir.patch
CommitLineData
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)
14diff -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
17@@ -147,17 +142,7 @@
18 "/tmp/updates/%s/%s" %(pypkg, f))
19
20 # get the libdir. *sigh*
95f1cd3c
ER		 21- if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
22- os.X_OK):
23- libdir = "lib64"
c2f22095
AM		 24- elif os.access("/usr/lib/python%s/site-packages/%s" %(pyver, pypkg),
25- os.X_OK):
95f1cd3c 26- libdir = "lib"
c2f22095
AM		 27- else:
28- # If the directory doesn't exist, there's nothing to link over.
29- # This happens if we forgot to include one of the above packages
30- # in the image, for instance.
31- continue
95f1cd3c 32+ libdir = sys.lib
bcf777dd 33
c2f22095
AM		 34 if os.access("/tmp/updates/%s" %(pypkg,), os.X_OK):
35 for f in os.listdir("/usr/%s/python%s/site-packages/%s" %(libdir,
36@@ -303,15 +288,15 @@
37 sys.path.append('textw')
38 sys.path.append('iw')
39 else:
40- sys.path.append('/usr/lib/anaconda')
41- sys.path.append('/usr/lib/anaconda/textw')
42- sys.path.append('/usr/lib/anaconda/iw')
43+ sys.path.append('/usr/%s/anaconda' % sys.lib)
44+ sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
45+ sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
46
47 if (os.path.exists('booty')):
48 sys.path.append('booty')
49 sys.path.append('booty/edd')
50 else:
51- sys.path.append('/usr/lib/booty')
52+ sys.path.append('/usr/%s/booty' % sys.lib)
53
54 sys.path.append('/usr/share/system-config-date')
55
56@@ -390,7 +375,7 @@
57 if child == 0:
58 for p in ('/mnt/source/RHupdates/pyrc.py', \
59 '/tmp/updates/pyrc.py', \
60- '/usr/lib/anaconda-runtime/pyrc.py'):
61+ '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib):
62 if os.access(p, os.R_OK|os.X_OK):
63 os.environ['PYTHONSTARTUP'] = p
64 break
65diff -ur anaconda-11.2.0.24/command-stubs/list-harddrives-stub anaconda-11.2.0.24/command-stubs/list-harddrives-stub
66--- anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2006-06-22 19:18:11.000000000 +0200
67+++ anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2007-02-20 18:19:21.454623000 +0100
68@@ -10,7 +10,7 @@
69 if (os.path.exists('isys')):
70 sys.path.append('isys')
bcf777dd
ER		 71
72-sys.path.append('/usr/lib/anaconda')
73+sys.path.append('/usr/%s/anaconda' % sys.lib)
74
c2f22095
AM		 75 import anaconda_log
76 import parted
77diff -ur anaconda-11.2.0.24/command-stubs/loadkeys-stub anaconda-11.2.0.24/command-stubs/loadkeys-stub
78--- anaconda-11.2.0.24/command-stubs/loadkeys-stub 2004-05-11 23:52:00.000000000 +0200
79+++ anaconda-11.2.0.24/command-stubs/loadkeys-stub 2007-02-20 18:18:48.482623000 +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
c2f22095
AM		 89diff -ur anaconda-11.2.0.24/command-stubs/losetup-stub anaconda-11.2.0.24/command-stubs/losetup-stub
90--- anaconda-11.2.0.24/command-stubs/losetup-stub 2001-02-20 20:48:12.000000000 +0100
91+++ anaconda-11.2.0.24/command-stubs/losetup-stub 2007-02-20 18:19:53.858623000 +0100
bcf777dd
ER		 92@@ -7,7 +7,7 @@
93 if (os.path.exists('isys')):
94 sys.path.append('isys')
95
96-sys.path.append('/usr/lib/anaconda')
97+sys.path.append('/usr/%s/anaconda' % sys.lib)
98
99 import isys
100 from sys import argv
c2f22095
AM		 101diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-stubs/mknod-stub
102--- anaconda-11.2.0.24/command-stubs/mknod-stub 2006-07-31 22:40:00.000000000 +0200
103+++ anaconda-11.2.0.24/command-stubs/mknod-stub 2007-02-20 18:20:05.686623000 +0100
104@@ -1,7 +1,7 @@
105 #!/usr/bin/python
106
107 import sys, os
108-sys.path.append('/usr/lib/anaconda')
109+sys.path.append('/usr/%s/anaconda' % sys.lib)
110 import isys
111 import string
112 import stat
c2f22095
AM		 113diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
114--- anaconda-11.2.0.24/command-stubs/raidstart-stub 2006-03-28 18:49:14.000000000 +0200
115+++ anaconda-11.2.0.24/command-stubs/raidstart-stub 2007-02-20 18:19:36.002623000 +0100
bcf777dd
ER		 116@@ -12,7 +12,7 @@
117 sys.path.append('gnome-map')
118 sys.path.append('isys')
119
120-sys.path.append('/usr/lib/anaconda')
121+sys.path.append('/usr/%s/anaconda' % sys.lib)
122
c2f22095 123 import anaconda_log
bcf777dd 124 import fsset
c2f22095
AM		 125diff -ur anaconda-11.2.0.24/command-stubs/raidstop-stub anaconda-11.2.0.24/command-stubs/raidstop-stub
126--- anaconda-11.2.0.24/command-stubs/raidstop-stub 2006-03-28 18:49:14.000000000 +0200
127+++ anaconda-11.2.0.24/command-stubs/raidstop-stub 2007-02-20 18:20:21.294623000 +0100
128@@ -12,7 +12,7 @@
129 sys.path.append('gnome-map')
bcf777dd
ER		 130 sys.path.append('isys')
131
132-sys.path.append('/usr/lib/anaconda')
133+sys.path.append('/usr/%s/anaconda' % sys.lib)
134
c2f22095
AM		 135 import anaconda_log
136 import fsset
137diff -ur anaconda-11.2.0.24/command-stubs/syslogd-stub anaconda-11.2.0.24/command-stubs/syslogd-stub
138--- anaconda-11.2.0.24/command-stubs/syslogd-stub 2006-05-01 18:39:15.000000000 +0200
139+++ anaconda-11.2.0.24/command-stubs/syslogd-stub 2007-02-20 18:20:40.322623000 +0100
bcf777dd
ER		 140@@ -1,7 +1,7 @@
141 #!/usr/bin/python
142
143 import sys
144-sys.path.append('/usr/lib/anaconda')
145+sys.path.append('/usr/%s/anaconda' % sys.lib)
bcf777dd 146
c2f22095
AM		 147 def usage():
148 sys.stderr.write("syslogd [root] [output file]")
149diff -ur anaconda-11.2.0.24/installclass.py anaconda-11.2.0.24/installclass.py
150--- anaconda-11.2.0.24/installclass.py 2007-02-06 17:14:43.000000000 +0100
151+++ anaconda-11.2.0.24/installclass.py 2007-02-20 18:09:46.158623000 +0100
152@@ -485,7 +485,7 @@
153 elif os.access("/tmp/product/installclasses", os.R_OK):
154 path = "/tmp/product/installclasses"
155 else:
156- path = "/usr/lib/anaconda/installclasses"
157+ path = "/usr/%s/anaconda/installclasses" % sys.lib
bcf777dd 158
c2f22095
AM		 159 # append the location of installclasses to the python path so we
160 # can import them
161diff -ur anaconda-11.2.0.24/language.py anaconda-11.2.0.24/language.py
162--- anaconda-11.2.0.24/language.py 2006-10-10 19:18:09.000000000 +0200
163+++ anaconda-11.2.0.24/language.py 2007-02-20 18:09:46.158623000 +0100
164@@ -21,6 +21,7 @@
165 from rhpl.simpleconfig import SimpleConfigFile
166
167 import logging
168+import sys
169 log = logging.getLogger("anaconda")
170
171 # Converts a single language into a "language search path". For example,
172@@ -57,7 +58,7 @@
173 self.current = "en_US.UTF-8"
174
175 # English name -> native name mapping
176- search = ('lang-names', '/usr/lib/anaconda/lang-names')
177+ search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
178 for path in search:
179 if os.access(path, os.R_OK):
180 f = open(path, 'r')
181@@ -72,7 +73,7 @@
182 # nick -> (name, short name, font, keyboard, timezone) mapping
183 search = ('lang-table', '/tmp/updates/lang-table',
184 '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
185- '/usr/lib/anaconda/lang-table')
186+ '/usr/%s/anaconda/lang-table' % sys.lib)
187 for path in search:
188 if os.access(path, os.R_OK):
189 f = open(path, "r")
190diff -ur anaconda-11.2.0.24/loader2/loader.c anaconda-11.2.0.24/loader2/loader.c
191--- anaconda-11.2.0.24/loader2/loader.c 2007-02-13 17:52:22.000000000 +0100
192+++ anaconda-11.2.0.24/loader2/loader.c 2007-02-20 18:17:47.146623000 +0100
193@@ -300,6 +300,8 @@
194 setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
195 else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
196 setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
197+ else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
198+ setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
199 setenv("LD_LIBRARY_PATH", LIBPATH, 1);
200 setenv("LANG", "C", 1);
201
202diff -ur anaconda-11.2.0.24/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
203--- anaconda-11.2.0.24/scripts/pkgorder 2007-01-30 23:26:15.000000000 +0100
204+++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:17:08.462623000 +0100
205@@ -18,8 +18,8 @@
206 import sys
207 import yum
208
209-sys.path.append("/usr/lib/anaconda")
210-sys.path.append("/usr/lib/booty")
211+sys.path.append("/usr/%s/anaconda" % sys.lib)
212+sys.path.append("/usr/%s/booty" % sys.lib)
213
214 import anaconda_log
215 import logging
216
Graphical system installer
This page took 0.046691 seconds and 4 git commands to generate.