[PATCH] Adjust the paths used for updates

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



NOTE: If someone else could try this out and confirm that it really
works, I'd appreciate it.


Now that we are using the pyanaconda module the updates need to
include it, and the path needs to be adjusted to include it.

isys should also be included next to it when it's __init__.py changes
---
 anaconda            |    7 ++++---
 scripts/makeupdates |    3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/anaconda b/anaconda
index d905344..7a74108 100755
--- a/anaconda
+++ b/anaconda
@@ -256,9 +256,10 @@ def setupPythonPath():
     d = get_python_lib(plat_specific=1)
 
     if haveUpdates:
-        sys.path.insert(ndx+1, "%s/pyanaconda" % d)
-        sys.path.insert(ndx+2, "%s/pyanaconda/textw" % d)
-        sys.path.insert(ndx+3, "%s/pyanaconda/iw" % d)
+        sys.path.insert(ndx+1, "/tmp/updates/pyanaconda" )
+        sys.path.insert(ndx+2, "%s/pyanaconda" % d)
+        sys.path.insert(ndx+3, "%s/pyanaconda/textw" % d)
+        sys.path.insert(ndx+4, "%s/pyanaconda/iw" % d)
     else:
         sys.path.insert(0, "%s/pyanaconda" % d)
         sys.path.insert(1, "%s/pyanaconda/textw" % d)
diff --git a/scripts/makeupdates b/scripts/makeupdates
index 8cb252c..b91e785 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -125,8 +125,7 @@ def copyUpdatedFiles(tag, updates, cwd):
             fields = file.split('/')
             subdir = fields[0]
 
-            if subdir == 'installclasses' or subdir == 'storage' or \
-               subdir == 'booty':
+            if subdir in ['booty', 'isys', 'pyanaconda']:
                 subupdates = os.path.realpath(updates + '/' + subdir)
                 if os.path.isdir(subupdates):
                     shutil.rmtree(subupdates)
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux