From: Chris Gianelloni Date: Wed, 22 Nov 2006 16:37:33 +0000 (+0000) Subject: Added a patch from Bardur Arantsson which resolves... X-Git-Tag: CATALYST_2_0_6_916~303 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=276f4394784487df4cd67cadfdaf8074ec608888;p=catalyst.git Added a patch from Bardur Arantsson which resolves an issue where a variable could be accessed unitialized in obscure circumstances. This is wrt bug #144984. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1191 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c883a607..dabbd274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 22 Nov 2006; Chris Gianelloni + modules/livecd_stage2_target.py, targets/support/livecdfs-update.sh: + Added a patch from Bardur Arantsson which + resolves an issue where a variable could be accessed unitialized in obscure + circumstances. This is wrt bug #144984. + 22 Nov 2006; Chris Gianelloni catalyst, modules/generic_stage_target.py, modules/livecd_stage2_target.py, modules/stage2_target.py, modules/stage4_target.py: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index a8e2fdc7..5df2aa7b 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -73,6 +73,7 @@ class livecd_stage2_target(generic_stage_target): def unpack(self): unpack=True + display_msg=None clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") @@ -111,6 +112,9 @@ class livecd_stage2_target(generic_stage_target): if not os.path.exists(self.settings["pkgcache_path"]): os.makedirs(self.settings["pkgcache_path"],0755) + if not display_msg: + raise CatalystError,"Could not find appropriate source. Please check the 'source_subpath' setting in the spec file." + print display_msg cmd(unpack_cmd,error_msg,env=self.env) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 0ee63b68..cb871f04 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -346,7 +346,8 @@ case ${clst_livecd_type} in /home/${username}/Desktop cp -f /usr/share/applications/installer-dialog.desktop \ /home/${username}/Desktop - sed -i -e 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ + sed -i -e \ + 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ /home/${username}/Desktop/installer-dialog.desktop sed -i -e 's:Exec=installer-gtk:Exec=installer:' \ /home/${username}/Desktop/installer-gtk.desktop