From 5fe8cc69fc8f7e1cc8ebd570ca084cd8752df064 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Thu, 8 Nov 2012 17:09:23 -0500
Subject: Fix makeupdates to correctly detect and include changes in isys.

I guess I'm the only person to touch isys in a very long time, huh?
---
 scripts/makeupdates | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'scripts/makeupdates')

diff --git a/scripts/makeupdates b/scripts/makeupdates
index 89e12fa2b..1c482a4f0 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -205,7 +205,7 @@ def _compilableChanged(tag, compilable):
     return False
 
 def isysChanged(tag):
-    return _compilableChanged(tag, 'isys')
+    return _compilableChanged(tag, 'pyanaconda/isys')
 
 def widgetsChanged(tag):
     return _compilableChanged(tag, 'widgets')
@@ -220,9 +220,16 @@ def copyUpdatedIsys(updates, cwd):
 
     os.system('make')
 
-    isysmodule = os.path.realpath(cwd + '/isys/.libs/_isys.so')
+    # Updates get overlaid onto the runtime filesystem. Anaconda expects them
+    # to be in /run/install/updates, so put them in
+    # $updatedir/run/install/updates.
+    tmpupdates = updates.rstrip('/')
+    if not tmpupdates.endswith("/run/install/updates/pyanaconda"):
+        tmpupdates = os.path.join(tmpupdates, "run/install/updates/pyanaconda")
+
+    isysmodule = os.path.realpath(cwd + '/pyanaconda/isys/.libs/_isys.so')
     if os.path.isfile(isysmodule):
-        shutil.copy2(isysmodule, updates)
+        shutil.copy2(isysmodule, tmpupdates)
 
 def copyUpdatedWidgets(updates, cwd):
     os.chdir(cwd)
-- 
cgit