From: Chris Gianelloni Date: Fri, 4 Apr 2008 00:53:17 +0000 (+0000) Subject: Added TODO. Changed create_handbook_icon call to only be called if /docs/handbook... X-Git-Tag: CATALYST_2_0_6_916~109 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b10ecda53029f7632c912665f4e1746d0929ad23;p=catalyst.git Added TODO. Changed create_handbook_icon call to only be called if /docs/handbook/index.html exists on the disk or in livecd/overlay. 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 2a1eaf36..09700390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 04 Apr 2008; Chris Gianelloni +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 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 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 catalyst, targets/support/chroot-functions.sh: diff --git a/TODO b/TODO new file mode 100644 index 00000000..b17635e4 --- /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 3ec261eb..f28cf1d5 100644 --- 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 dcf1d0b3..23a51482 100755 --- 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}" ]