From 6cbd8697f121f3f6dc481479b9af348e7843e8e9 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
Date: Jun 13 2007 11:53:32 +0000
Subject: Fix #147


---

diff --git a/revisor.py b/revisor.py
index 1ae8182..35f4b18 100755
--- a/revisor.py
+++ b/revisor.py
@@ -110,15 +110,15 @@ else:
         import gtk.glade
         import gobject
         import gtk.gdk as gdk
-        import revisor.gui
     except:
         cfg.revisorUseGUI = False
         cfg.revisorUseCLI = True
-        import revisor.cli
 
     if cfg.revisorUseGUI:
+        import revisor.gui
         revisorBase = revisor.gui.RevisorGUI(base, log)
     else:
+        import revisor.cli
         revisorBase = revisor.cli.RevisorCLI(base, log)
 
 # Direct things for revisorBase from here
diff --git a/revisor/base.py b/revisor/base.py
index aea3689..356f11c 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -385,7 +385,7 @@ class RevisorBase():
             for pkg in self.cfg.yumobj.tsInfo.pkgdict.keys():
                 if not pkg in self.cfg.pkglist_selected_tups:
                     self.log.debug("Removing %s from tsInfo" % str(pkg))
-                    self.cfg.yumobj.tsInfo.remove(self.cfg.yumobj.tsInfo.pkgdict[pkg])
+                    self.cfg.yumobj.tsInfo.remove(pkg)
                 else:
                     self.log.debug("Not removing %s from tsInfo" % str(pkg))
 
@@ -726,7 +726,8 @@ class RevisorBase():
 # filesystem bigger then that
 #        self.cfg.payload_livemedia = installsize / 1024 / 1024
 
-        livemedia_targetsize = self.cfg.payload_livemedia + 500
+        livemedia_targetsize = self.cfg.payload_livemedia + 1536
+        self.log.debug("Setting Live Media Ext3 Filesystem Size to %s" % str(livemedia_targetsize))
         # Get our object from pilgrim
         liveImage = lm_optical.LMOptical(self)
 
diff --git a/revisor/pilgrim.py b/revisor/pilgrim.py
index 6e3a065..01fa207 100644
--- a/revisor/pilgrim.py
+++ b/revisor/pilgrim.py
@@ -422,10 +422,10 @@ class InstallationTarget:
 
         if not base_on:
             # create a few directories needed if it's a new image
-            os.makedirs(self.build_dir + "/install_root/etc")
-            os.makedirs(self.build_dir + "/install_root/boot")
-            os.makedirs(self.build_dir + "/install_root/var/log")
-            os.makedirs(self.build_dir + "/install_root/var/cache/yum")
+            if not os.access("%s/install_root/etc" % self.build_dir, os.R_OK): os.makedirs(self.build_dir + "/install_root/etc")
+            if not os.access("%s/install_root/boot" % self.build_dir, os.R_OK): os.makedirs(self.build_dir + "/install_root/boot")
+            if not os.access("%s/install_root/var/log" % self.build_dir, os.R_OK): os.makedirs(self.build_dir + "/install_root/var/log")
+            if not os.access("%s/install_root/var/cache/yum" % self.build_dir, os.R_OK): os.makedirs(self.build_dir + "/install_root/var/cache/yum")
 
         # bind mount system directories into install_root/
         for (f, dest) in [("/sys", None), ("/proc", None), ("/dev", None),