merge taroon branch. mostly package bits, but a lot of other misc stuff

and cleanups in here too

1 files changed, 5 insertions, 1 deletions

diff --git a/anaconda b/anaconda
index 2278103c6..e0bd44f6b 100755
--- a/anaconda
+++ b/anaconda
@@ -109,7 +109,7 @@ def startVNCServer(vncpassword=None, root='/'):
 	    except:
 		dup_log("Unknown expection setting vnc password.")
 		rc = 1
-		
+
 	    if rc:
 		dup_log(_("Unable to set vnc password - using no password!"))
 		dup_log(_("Make sure your password is at least 6 characters in length."))
@@ -327,6 +327,10 @@ else:
 if os.environ.has_key("LD_PRELOAD"):
     del os.environ["LD_PRELOAD"]
 
+# we need to do this really early so we make sure its done before rpm
+# is imported
+iutil.writeRpmPlatform()
+
 try:
     (args, extra) = isys.getopt(theargs, 'CGTRxtdr:fm:', 
           [ 'graphical', 'text', 'test', 'debug', 'nofallback',