SOURCES: anaconda-libdir.patch - find booty from lib64 dir

glen glen at pld-linux.org
Thu May 18 22:50:05 CEST 2006


Author: glen                         Date: Thu May 18 20:50:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- find booty from lib64 dir

---- Files affected:
SOURCES:
   anaconda-libdir.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/anaconda-libdir.patch
diff -u SOURCES/anaconda-libdir.patch:1.2 SOURCES/anaconda-libdir.patch:1.3
--- SOURCES/anaconda-libdir.patch:1.2	Thu May 18 22:42:50 2006
+++ SOURCES/anaconda-libdir.patch	Thu May 18 22:50:00 2006
@@ -11,8 +11,8 @@
  ANACONDADATADIR = /usr/share/anaconda
  PYTHON = python2.4
  PYTHONINCLUDE = /usr/include/$(PYTHON)
---- ./anaconda	2006-03-06 21:45:27.000000000 +0200
-+++ /usr/sbin/anaconda	2006-05-18 23:34:39.000000000 +0300
+--- ./anaconda~	2006-05-18 23:34:39.000000000 +0300
++++ ./anaconda	2006-05-18 23:48:57.000000000 +0300
 @@ -275,12 +275,7 @@
  
  # handle updates of just a single file in a python package
@@ -41,7 +41,7 @@
  	
  	if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
  	    try:
-@@ -330,9 +320,9 @@
+@@ -330,15 +320,15 @@
      sys.path.append('textw')
      sys.path.append('iw')
  else:
@@ -54,3 +54,10 @@
  
  if (os.path.exists('booty')):
      sys.path.append('booty')
+     sys.path.append('booty/edd')
+ else:
+-    sys.path.append('/usr/lib/booty')
++    sys.path.append('/usr/%s/booty' % sys.lib)
+ 
+ sys.path.append('/usr/share/system-config-keyboard')
+ sys.path.append('/usr/share/system-config-date')
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/anaconda-libdir.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list