Add patch from bug #135051 to fix the seedcache extraction logic.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1145 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 3cd5bcbdc940d04aa9063b7cbe975e9e258bd58d..a1cc7c2a0cabbd6287ca2991457897d10e47a932 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.629 2006/06/03 01:58:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.630 2006/06/08 21:27:29 wolf31o2 Exp $
+
+  08 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py, targets/support/livecdfs-update.sh:
+  Add patch from bug #135051 to fix the seedcache extraction logic.
 
   03 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index ee9141a7d44f8b9bae997685cfa44029af23e5d6..a1c9ce757fafece33cb6e89e4ed5addba1c8341d 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.134 2006/05/19 16:25:20 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.135 2006/06/08 21:27:30 wolf31o2 Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -572,12 +572,22 @@ class generic_stage_target(generic_target):
 
                clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
                
-               if self.settings.has_key("SEEDCACHE") and os.path.isdir(self.settings["source_path"]): 
-                       unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
-                       display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\
-                               self.settings["chroot_path"]+" (This may take some time) ...\n"
-                       error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
+               if self.settings.has_key("SEEDCACHE"):
+                       if os.path.isdir(self.settings["source_path"]): 
+                               # SEEDCACHE Is a directory, use Rsync
+                               unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
+                               display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\
+                                       self.settings["chroot_path"]+" (This may take some time) ...\n"
+                               error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
+                       else:
+                               # SEEDCACHE is a not a directory, try untar'ing
+                               print "Referenced SEEDCACHE does not appear to be a directory, trying to untar..."
+                               display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\
+                                       self.settings["chroot_path"]+" (This may take some time) ...\n"
+                               unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"]
+                               error_msg="Tarball extraction of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
                else:
+                       # No SEEDCACHE, use tar
                        display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\
                                self.settings["chroot_path"]+" (This may take some time) ...\n"
                        unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"]

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 94aa9178eecaaf0efb38d17493e189532370c42c..b48b88a0dda2a09c04c19d2c7f71c30dc9fc0a58 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.51 2006/06/03 01:58:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.52 2006/06/08 21:27:30 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -247,6 +247,7 @@ case ${clst_livecd_type} in
                # Setup Gnome theme
                if [ "${clst_livecd_xsession}" == "gnome" ]
                then
+                       # Umm... there is no Clearlooks icon theme.  Yup.  I'm a retard.
 #                      gconftool-2 --direct \
 #                              --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
 #                              --type string --set /desktop/gnome/interface/icon_theme Clearlooks