summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2012-08-29 16:02:21 -0700
committerJesse Keating <jkeating@redhat.com>2012-08-30 05:34:28 -0700
commitfd1a90bdcb648291a50cdcac7ed6b3ee1a2179a3 (patch)
tree718b53a3796aed086849252c27d85ad96f7c8a9a /anaconda
parente91c080062522131839f9745722fc718bc3f1244 (diff)
downloadanaconda-fd1a90bdcb648291a50cdcac7ed6b3ee1a2179a3.tar.gz
anaconda-fd1a90bdcb648291a50cdcac7ed6b3ee1a2179a3.tar.xz
anaconda-fd1a90bdcb648291a50cdcac7ed6b3ee1a2179a3.zip
Setup python path /after/ we've done updates
If we try to setup the python path before /tmp/updates/ exists, the path will get thrown out and won't be used even if that path will get created at some point later. So just re-order things. This is ugly, and shouls only live for the F18 Alpha. After that we should be using /run/install/updates directly and thus the path can be set there early.
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda3
1 files changed, 1 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index c08137882..0ca74a634 100755
--- a/anaconda
+++ b/anaconda
@@ -620,8 +620,6 @@ def prompt_for_ssh():
if __name__ == "__main__":
print "Starting installer, one moment..."
- setupPythonPath()
-
# Allow a file to be loaded as early as possible
try:
import updates_disk_hook
@@ -630,6 +628,7 @@ if __name__ == "__main__":
# this handles setting up updates for pypackages to minimize the set needed
setupPythonUpdates()
+ setupPythonPath()
# do this early so we can set flags before initializing logging
from pyanaconda.flags import flags