Added TODO. Changed create_handbook_icon call to only be called if /docs/handbook...

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

diff --git a/ChangeLog b/ChangeLog
index 2a1eaf3658c75c09bec4325fb3dfb1cfcb712839..09700390012de39f1deb306a082fb956857bf097 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  04 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> +TODO,
+  modules/generic_stage_target.py, targets/support/livecdfs-update.sh:
+  Added TODO. Changed create_handbook_icon call to only be called if
+  /docs/handbook/index.html exists on the disk or in livecd/overlay.
+
   30 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/kmerge.sh:
   Run sed on KERNELVERSION to escape the slashes so we can use it in another
@@ -8,8 +13,8 @@
 
   30 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/kmerge.sh:
-  Modify test to run if package.provided exists instead of if it doesn't Run
-  sed on the correct file
+  Modify test to run if package.provided exists instead of if it doesn't.
+  Run sed on the correct file.
 
   27 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/chroot-functions.sh:

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..b17635e
--- /dev/null
+++ b/TODO
@@ -0,0 +1,5 @@
+- Remove spec_prefix from all exported variables
+- sign materials automatically
+- create logs
+- send emails
+- separate out options that control catalyst versus the package manager

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 3ec261ebcb4b86c725005521f1835bded463745a..f28cf1d57e8ca4e9db554bde4c633197ad72717e 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -545,7 +545,6 @@ class generic_stage_target(generic_target):
                                        self.settings[self.settings["spec_prefix"]+\
                                        "/root_overlay"].split()
 
-
        def set_root_path(self):
                """ ROOT= variable for emerges """
                self.settings["root_path"]="/"

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index dcf1d0b3912550c33d5b4c03f2271b26184240c0..23a514824aea700a9f0de8947a8f37a973be806e 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -328,7 +328,8 @@ case ${clst_livecd_type} in
                rm -f /var/log/lastlog && touch /var/log/lastlog
 
                # Create our Handbook icon
-               create_handbook_icon
+               [ -e /docs/handbook/index.html ] && create_handbook_icon
+               [ -n "${clst_livecd_overlay}" ] && [ -e ${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon
 
                # Copy our icons into place and build home directories
                if [ -n "${clst_livecd_users}" ]