[SCM] GUI front-end for Debian Live. branch, master, updated. f3af49d8f3a857ec5dd3f09dbb85881e761a7a23

[Chris Lamb]

The following commit has been merged in the master branch:
commit 4d6adfa2c1cef43643cef3c1f5c4ec09aef5bc64
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 9 00:18:55 2009 +0100

    Revert back to using --preserve-env after reverting this in #491242. This seems a more robust way of ensuring that the child process can actually talk to X. We set the path manually in live-magic-builder to prevent the actual failure originally reported in #491242.

diff --git a/LiveMagic/__init__.py b/LiveMagic/__init__.py
index 1f16acd..24a5638 100644
--- a/LiveMagic/__init__.py
+++ b/LiveMagic/__init__.py
@@ -64,12 +64,6 @@ class LiveMagic(object):
         parser.add_option('--build-for', dest='build_for',
             metavar='owner:group', help="Perform build on behalf of owner:group. "
             "This option is used internally.")
-        parser.add_option('--kde-full-session', dest='kde_full_session',
-            metavar='', help="Value of KDE_FULL_SESSION. "
-            "This option is used internally.")
-        parser.add_option('--gnome-desktop-session-id', dest='gnome_desktop_session_id',
-            metavar='', help="Value of GNOME_DESKTOP_SESSION_ID. "
-            "This option is used internally.")
         options, args = parser.parse_args()
 
         c = controllers.Controller()
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 211d10f..2c89ebf 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -86,11 +86,6 @@ class BuildController(object):
             self.view.set_build_titles(_("Build process finished"),
                 _("Your Debian Live system has been created successfully."))
 
-            if self.options.kde_full_session != '-':
-                os.environ['KDE_FULL_SESSION'] = self.options.kde_full_session
-            if self.options.gnome_desktop_session_id != '-':
-                os.environ['GNOME_DESKTOP_SESSION_ID'] = self.options.gnome_desktop_session_id
-
             # Try some file managers.
             for manager in ('/usr/bin/xdg-open', '/usr/bin/pcmanfm', '/usr/bin/thunar'):
                 if not os.path.exists(manager):
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index e96b057..15506c2 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -60,12 +60,11 @@ class WizardController(object):
             text = _("Debian Live Magic requires superuser capabilities to build your Debian Live system.")
 
             for num in range(3):
-                cmd = ['gksu', '--disable-grab',
+                cmd = ['gksu', '--disable-grab', '--preserve-env',
                     '--message', '<big><b>%s</b></big>\n\n%s' % (title, text), '--',
                     utils.find_resource('live-magic'),
                     '--build-for', '%d:%d' % (os.geteuid(), os.getegid()),
-                    '--kde-full-session', os.environ.get('KDE_FULL_SESSION', '-'),
-                    '--gnome-desktop-session-id', os.environ.get('GNOME_DESKTOP_SESSION_ID', '-')]
+                ]
                 p = subprocess.Popen(cmd)
 
                 os.waitpid(p.pid, 0)
diff --git a/debian/changelog b/debian/changelog
index b93b10c..d8b3869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ live-magic (1.7) UNRELEASED; urgency=low
     when run from Git (as that directory is considered a build directory).
   * Add missing import so we don't fail with a misleading error when GTK fails
     to initialise.
+  * Revert back to using --preserve-env after reverting this in #491242. This
+    seems a more robust way of ensuring that the child process can actually
+    talk to X. We set the path manually in live-magic-builder to prevent the
+    actual failure originally reported in #491242.
 
  -- Chris Lamb <lamby at debian.org>  Wed, 08 Jul 2009 22:26:23 +0100
 
diff --git a/misc/live-magic-builder b/misc/live-magic-builder
index c792037..f0d4307 100755
--- a/misc/live-magic-builder
+++ b/misc/live-magic-builder
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+
 LOG="build-log.txt"
 
 touch ${LOG}

-- 
GUI front-end for Debian Live.