1 --- anaconda-11.0.5/Makefile.inc~ 2005-06-13 22:09:23.000000000 +0300
2 +++ anaconda-11.0.5/Makefile.inc 2006-05-18 22:34:08.000000000 +0300
5 # define destination locations
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
13 PYTHONINCLUDE = /usr/include/$(PYTHON)
14 --- ./anaconda 2006-05-18 23:48:57.000000000 +0300
15 +++ anaconda-11.0.5/anaconda 2006-05-19 00:34:17.000000000 +0300
18 # handle updates of just a single file in a python package
19 def setupPythonUpdates():
22 - # get the python version. first of /usr/lib/python*, strip off the
24 - pyvers = glob.glob("/usr/lib/python*")
25 - pyver = pyvers[0][15:]
26 + pyver = sys.version[:3]
29 os.mkdir("/tmp/updates")
32 for pypkg in ("rhpl", "yum", "rpmUtils", "urlgrabber", "repomd",
33 "pykickstart", "rhpxl"):
34 - # get the libdir. *sigh*
35 - if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
42 if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
45 sys.path.append('textw')
48 - sys.path.append('/usr/lib/anaconda')
49 - sys.path.append('/usr/lib/anaconda/textw')
50 - sys.path.append('/usr/lib/anaconda/iw')
51 + sys.path.append('/usr/%s/anaconda' % sys.lib)
52 + sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
53 + sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
55 if (os.path.exists('booty')):
56 sys.path.append('booty')
57 sys.path.append('booty/edd')
59 - sys.path.append('/usr/lib/booty')
60 + sys.path.append('/usr/%s/booty' % sys.lib)
62 sys.path.append('/usr/share/system-config-keyboard')
63 sys.path.append('/usr/share/system-config-date')
66 for p in ('/mnt/source/RHupdates/pyrc.py', \
67 '/tmp/updates/pyrc.py', \
68 - '/usr/lib/anaconda-runtime/pyrc.py'):
69 + ('/usr/%s/anaconda-runtime/pyrc.py' % sys.lib)):
70 if os.access(p, os.R_OK|os.X_OK):
71 os.environ['PYTHONSTARTUP'] = p
73 --- anaconda-11.0.5/installclass.py~ 2006-05-19 00:01:55.000000000 +0300
74 +++ anaconda-11.0.5/installclass.py 2006-05-19 00:01:56.000000000 +0300
76 elif os.access("/tmp/product/installclasses", os.R_OK):
77 path = "/tmp/product/installclasses"
79 - path = "/usr/lib/anaconda/installclasses"
80 + path = "/usr/%s/anaconda/installclasses" % sys.lib
82 # append the location of installclasses to the python path so we
84 --- anaconda-11.0.5/language.py 2006-05-19 00:03:47.000000000 +0300
85 +++ anaconda-11.0.5/language.py 2006-05-19 00:10:52.000000000 +0300
87 from rhpl.simpleconfig import SimpleConfigFile
91 log = logging.getLogger("anaconda")
93 # Converts a single language into a "language search path". For example,
95 self.current = "en_US.UTF-8"
97 # English name -> native name mapping
98 - search = ('lang-names', '/usr/lib/anaconda/lang-names')
99 + search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
101 if os.access(path, os.R_OK):
104 # nick -> (name, short name, font, keyboard, timezone) mapping
105 search = ('lang-table', '/tmp/updates/lang-table',
106 '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
107 - '/usr/lib/anaconda/lang-table')
108 + '/usr/%s/anaconda/lang-table' % sys.lib)
110 if os.access(path, os.R_OK):
112 --- anaconda-11.0.5/iw/release_notes_viewer_gui.py~ 2006-01-25 21:51:18.000000000 +0200
113 +++ anaconda-11.0.5/iw/release_notes_viewer_gui.py 2006-05-19 00:29:16.000000000 +0300
116 from rhpl.translate import _, N_
118 -sys.path.append('/usr/lib/anaconda')
119 +sys.path.append('/usr/%s/anaconda' % sys.lib)
121 from gui import TextViewBrowser, addFrame
123 --- anaconda-11.0.5/scripts/pkgorder~ 2006-05-19 00:12:16.000000000 +0300
124 +++ anaconda-11.0.5/scripts/pkgorder 2006-05-19 00:29:50.000000000 +0300
126 handler.setLevel(logging.ERROR)
127 logger.addHandler(handler)
129 -sys.path.append("/usr/lib/anaconda")
130 +sys.path.append("/usr/%s/anaconda" % sys.lib)
132 from optparse import OptionParser
133 from repomd.packageSack import PackageSack
134 --- anaconda-11.0.5/loader2/loader.c~ 2006-03-06 21:45:27.000000000 +0200
135 +++ anaconda-11.0.5/loader2/loader.c 2006-05-19 00:31:17.000000000 +0300
137 setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
138 else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
139 setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
140 + else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
141 + setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
142 setenv("LD_LIBRARY_PATH", LIBPATH, 1);
143 setenv("LANG", "C", 1);
145 --- anaconda-11.0.5/gui.py~ 2006-02-14 21:23:59.000000000 +0200
146 +++ anaconda-11.0.5/gui.py 2006-05-19 00:31:53.000000000 +0300
147 @@ -1124,7 +1124,7 @@
148 # HACK to make release notes to work in test mode
149 # also HACK to make it work from RHupdates
150 for dir in ("iw/", "/mnt/source/RHupdates/",
151 - "/usr/lib/anaconda/iw/"):
152 + ("/usr/%s/anaconda/iw/" % sys.lib)):
153 path = dir + "release_notes_viewer_gui.py"
154 if os.access(path, os.X_OK):
156 --- anaconda-11.0.5/command-stubs/loadkeys-stub~ 2004-05-12 00:52:00.000000000 +0300
157 +++ anaconda-11.0.5/command-stubs/loadkeys-stub 2006-05-19 00:32:19.000000000 +0300
159 if (os.path.exists('isys')):
160 sys.path.append('isys')
162 -sys.path.append('/usr/lib/anaconda')
163 +sys.path.append('/usr/%s/anaconda' % sys.lib)
167 --- anaconda-11.0.5/command-stubs/pump-stub~ 2004-01-23 06:01:21.000000000 +0200
168 +++ anaconda-11.0.5/command-stubs/pump-stub 2006-05-19 00:32:33.000000000 +0300
170 if (os.path.exists('isys')):
171 sys.path.append('isys')
173 -sys.path.append('/usr/lib/anaconda')
174 +sys.path.append('/usr/%s/anaconda' % sys.lib)
178 --- anaconda-11.0.5/command-stubs/list-harddrives-stub~ 2002-08-16 09:07:59.000000000 +0300
179 +++ anaconda-11.0.5/command-stubs/list-harddrives-stub 2006-05-19 00:32:59.000000000 +0300
181 if (os.path.exists('isys')):
182 sys.path.append('isys')
184 -sys.path.append('/usr/lib/anaconda')
185 +sys.path.append('/usr/%s/anaconda' % sys.lib)
189 --- anaconda-11.0.5/command-stubs/raidstart-stub~ 2004-07-12 23:37:25.000000000 +0300
190 +++ anaconda-11.0.5/command-stubs/raidstart-stub 2006-05-19 00:33:13.000000000 +0300
192 sys.path.append('gnome-map')
193 sys.path.append('isys')
195 -sys.path.append('/usr/lib/anaconda')
196 +sys.path.append('/usr/%s/anaconda' % sys.lib)
200 --- anaconda-11.0.5/command-stubs/losetup-stub~ 2001-02-20 21:48:12.000000000 +0200
201 +++ anaconda-11.0.5/command-stubs/losetup-stub 2006-05-19 00:33:27.000000000 +0300
203 if (os.path.exists('isys')):
204 sys.path.append('isys')
206 -sys.path.append('/usr/lib/anaconda')
207 +sys.path.append('/usr/%s/anaconda' % sys.lib)
211 --- anaconda-11.0.5/command-stubs/mknod-stub~ 2004-12-20 23:20:08.000000000 +0200
212 +++ anaconda-11.0.5/command-stubs/mknod-stub 2006-05-19 00:33:39.000000000 +0300
217 -sys.path.append('/usr/lib/anaconda')
218 +sys.path.append('/usr/%s/anaconda' % sys.lib)
222 --- anaconda-11.0.5/command-stubs/raidstop-stub~ 2004-07-12 23:37:25.000000000 +0300
223 +++ anaconda-11.0.5/command-stubs/raidstop-stub 2006-05-19 00:33:50.000000000 +0300
225 sys.path.append('gnome-map')
226 sys.path.append('isys')
228 -sys.path.append('/usr/lib/anaconda')
229 +sys.path.append('/usr/%s/anaconda' % sys.lib)