This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 5 +++--
gui/gui.py | 2 +-
libs/Project.py | 4 ++++
libs/moblin_yum.py | 5 ++++-
libs/pdk_utils.py | 7 ++++++-
platforms/menlow-lpia-moblin2/fsets/base.fset | 7 +++++++
platforms/netbook-lpia-moblin2/fsets/base.fset | 7 +++++++
7 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit f05cdd56e2af39c340886bf9d996fe93f87da3cf
Author: Prajwal Mohan <[EMAIL PROTECTED]>
Date: Mon Nov 24 15:20:51 2008 -0800
Fixing bugs with yum group install
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index abe4159..9f6ea42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,10 @@ moblin-image-creator (0.48) gaston; urgency=low
* Should be using bzImage for nand and not vmlinuz
* Adding command line options to add repos to yum targets
* Changing Nand cmd line
- * Changing USB script to accomodate booting through KVM/QEMU
+ * Changing USB script to accomodate booting through KVM/QEMU
+ * Fixing bugs with yum group install
- -- Prajwal Mohan <[EMAIL PROTECTED]> Mon, 24 Nov 2008 12:25:40 -0800
+ -- Prajwal Mohan <[EMAIL PROTECTED]> Mon, 24 Nov 2008 15:20:31 -0800
moblin-image-creator (0.47) gaston; urgency=low
diff --git a/gui/gui.py b/gui/gui.py
index 25674f3..7980919 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -685,7 +685,7 @@ class App(object):
groupList = packageGroup.run()
if groupList:
progress_tree.get_widget('progress_label').set_text(_("Installing
Groups..."))
- self.current_target().installGroups(groupList)
+ self.current_target().installGroup(groupList)
progress_dialog.destroy()
diff --git a/libs/Project.py b/libs/Project.py
index 3efd238..b1c2862 100755
--- a/libs/Project.py
+++ b/libs/Project.py
@@ -444,6 +444,10 @@ class Target(FileSystem):
def installGroup(self, groups_list):
self.installGroups(groups_list)
+ print "Creating a fset file for the group"
+ group_file = open(os.path.join(self.top, "package-groups"), 'w')
+ group_file.close()
+
def installFset(self, fset, debug_pkgs = 0, fsets = None, seen_fsets =
None):
diff --git a/libs/moblin_yum.py b/libs/moblin_yum.py
index 3f91723..6827938 100644
--- a/libs/moblin_yum.py
+++ b/libs/moblin_yum.py
@@ -49,7 +49,10 @@ class YumPackageManager(moblin_pkgbase.PackageManager):
while (retry_count < 10):
self.updateChroot(chroot_dir, callback = callback)
# yum groupinstall
- command = "yum -y groupinstall %s" % (groups)
+ command = "yum -y groupinstall "
+ for group in groups_list:
+ command += "\"%s\" " % group
+ #command = "yum -y groupinstall %s" % (groups)
print _("Running 'yum groupinstall' command: %s") % (command)
print _("\t in the chroot: %s") % (chroot_dir)
result = pdk_utils.execChrootCommand(chroot_dir, command, callback
= callback)
diff --git a/libs/pdk_utils.py b/libs/pdk_utils.py
index 768f6d3..459b6d4 100755
--- a/libs/pdk_utils.py
+++ b/libs/pdk_utils.py
@@ -252,7 +252,12 @@ def setblocking(f, flag):
fcntl.fcntl(fd, fcntl.F_SETFL, fl)
def execCommand(cmd_line, quiet = False, output = None, callback = None):
- if output == None and callback == None:
+ if cmd_line.find("\"") != -1:
+ print "Command was: %s" % cmd_line
+ print "Found Quotes -- using os.system instead"
+ os.system(cmd_line)
+ return 0
+ if output == None and callback == None:
p = subprocess.Popen(cmd_line.split())
else:
p = subprocess.Popen(cmd_line.split(), stdout = subprocess.PIPE,
stderr = subprocess.STDOUT, stdin = subprocess.PIPE, close_fds = True)
diff --git a/platforms/menlow-lpia-moblin2/fsets/base.fset
b/platforms/menlow-lpia-moblin2/fsets/base.fset
index 085d778..3ed6921 100644
--- a/platforms/menlow-lpia-moblin2/fsets/base.fset
+++ b/platforms/menlow-lpia-moblin2/fsets/base.fset
@@ -50,3 +50,10 @@ DEPS=core-dev
DESC=Fset that provides build system specific pkgs
PKGS=build-root-config
DEBUG_PKGS=
+
+[Package-Groups]
+DESC=Virtual FSet for Package Groups
+PKGS=
+DEBUG_PKGS=
+DEPS=
+CONFLICTS=
diff --git a/platforms/netbook-lpia-moblin2/fsets/base.fset
b/platforms/netbook-lpia-moblin2/fsets/base.fset
index 3380485..1370a4c 100644
--- a/platforms/netbook-lpia-moblin2/fsets/base.fset
+++ b/platforms/netbook-lpia-moblin2/fsets/base.fset
@@ -75,3 +75,10 @@ DEBUG_PKGS=
DEPS=x appframework applications
CONFLICTS=appframework-devel-environment app-devel-environment
+[Package-Groups]
+DESC=Virtual FSet for Package Groups
+PKGS=
+DEBUG_PKGS=
+DEPS=
+CONFLICTS=
+
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
