From: Eric Edgar Date: Thu, 17 Nov 2005 20:56:16 +0000 (+0000) Subject: Attempt to fix bug #111752, due to mount_safety_check calling a lock object that... X-Git-Tag: CATALYST_2_0_6_916~601 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43a1f3c2f9e9b93ba6bb99da56763ae9d0bff3db;p=catalyst.git Attempt to fix bug #111752, due to mount_safety_check calling a lock object that doesnt exist yet git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@893 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 2d4e1719..90c92ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.381 2005/11/17 20:39:53 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.382 2005/11/17 20:56:15 rocket Exp $ + + 17 Nov 2005; Eric Edgar + modules/generic_stage_target.py: + Attempt to fix bug #111752, due to mount_safety_check calling a lock object + that doesnt exist yet 17 Nov 2005; Eric Edgar targets/support/kmerge.sh: Keep unnecessary programs from installing into kerncache diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 9770d4bc..a02d4e7c 100644 --- 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.75 2005/11/17 20:27:57 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.76 2005/11/17 20:56:16 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -700,7 +700,12 @@ class generic_stage_target(generic_target): # keep trying to umount the others, to minimize damage if developer makes a mistake if self.settings.has_key("SNAPCACHE") and x == "/usr/portage": - self.snapshot_lock_object.unlock() + try: + # Its possible the snapshot lock object isnt created yet + # this is because mount safety check calls unbind before the target is fully initialized + self.snapshot_lock_object.unlock() + except: + pass if ouch: """ if any bind mounts really failed, then we need to raise