From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8AtU-0002LJ-TR for garchives@archives.gentoo.org; Fri, 08 Apr 2011 12:34:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D46BE061F; Fri, 8 Apr 2011 12:34:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EDCC6E061F for ; Fri, 8 Apr 2011 12:34:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C49441B400C for ; Fri, 8 Apr 2011 12:34:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DFDE580065 for ; Fri, 8 Apr 2011 12:34:20 +0000 (UTC) From: "Jeremy Olexa" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeremy Olexa" Message-ID: <6ad7024b4f9e0f525d1e78c2a3becd2a67bd8520.darkside@gentoo> Subject: [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/, dev-util/catalyst/ X-VCS-Repository: dev/darkside X-VCS-Files: dev-util/catalyst/Manifest dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch X-VCS-Directories: dev-util/catalyst/files/ dev-util/catalyst/ X-VCS-Committer: darkside X-VCS-Committer-Name: Jeremy Olexa X-VCS-Revision: 6ad7024b4f9e0f525d1e78c2a3becd2a67bd8520 Date: Fri, 8 Apr 2011 12:34:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1d38038dc64dfb71d97fa19b9d9f7d1b commit: 6ad7024b4f9e0f525d1e78c2a3becd2a67bd8520 Author: Jeremy Olexa gentoo org> AuthorDate: Fri Apr 8 12:34:00 2011 +0000 Commit: Jeremy Olexa gentoo org> CommitDate: Fri Apr 8 12:34:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/darkside.git;a= =3Dcommit;h=3D6ad7024b [dev-util/catalyst] Fix patch --- dev-util/catalyst/Manifest | 2 +- ..._stage_target.py-stupify-the-LockDir-call.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index eb90567..a29e676 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,4 +1,4 @@ -AUX 0001-generic_stage_target.py-stupify-the-LockDir-call.patch 1542 RMD= 160 4ee07876c3db4331676e52744c27d4dc3f5246b8 SHA1 590b525afd59ec6e2254fd5= 610dec2d0d03f492d SHA256 ec74c54f8553072f10f6a88162c4a70889dadc341b279158= e49a6f9b9a5e7987 +AUX 0001-generic_stage_target.py-stupify-the-LockDir-call.patch 1512 RMD= 160 219572f242e29eeae6f5a5d115ca80680453141b SHA1 41bd132d4c62b6a31fb4114= c901dac8a00b2a9e2 SHA256 9de2cc4861feb0526e5c20633c901a2d376169b50fb8a422= c17a599494d39800 DIST catalyst-2.0.6.914.tar.bz2 819758 RMD160 5b4bd8fd35b61a0c1a6c853fca= 63c7248d2d1f71 SHA1 c4fa97d7c3469c93e38ab83c8f8056cff3a54cf1 SHA256 c20b3= d61328807cdd93e5e4e535998f938f1b3fd597eeaec597ab799f2baa7e8 EBUILD catalyst-2.0.6.914.ebuild 2480 RMD160 2cc5b500e6a5bccd66afaac17fe= 6d58ad3895e35 SHA1 30e8466c35f2d932536083f4c4a4fcb38cb58532 SHA256 4649e0= 03fee3222b9a6245c6d86f0ae84bdf3d5290f59508303deab28ca36c8b MISC ChangeLog 47583 RMD160 d67b764b3126c6a8f51b2433ccb2bb20c0694313 SHA= 1 cc3a22de9230a3d05cb3f79aca3f651f83839a7e SHA256 0c6e28f146d8c0f433239e3= 7ff946d3701dfe5fda19ee7338b955dfbc8382605 diff --git a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify= -the-LockDir-call.patch b/dev-util/catalyst/files/0001-generic_stage_targ= et.py-stupify-the-LockDir-call.patch index cfa3980..5838ed8 100644 --- a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-Lo= ckDir-call.patch +++ b/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-Lo= ckDir-call.patch @@ -19,7 +19,7 @@ index 55baea7..7a7ce0a 100644 self.settings["snapshot"]+"/") self.snapcache_lock=3D\ - catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) -+ catalyst_lock.LockDir(self.settings["/tmp"]) ++ catalyst_lock.LockDir("/tmp") print "Caching snapshot to "+self.settings["snapshot_cache_path"] =20 def set_chroot_path(self): @@ -28,7 +28,7 @@ index 55baea7..7a7ce0a 100644 self.settings["chroot_path"]=3Dnormpath(self.settings["storedir"]+\ "/tmp/"+self.settings["target_subpath"]+"/") - self.chroot_lock=3Dcatalyst_lock.LockDir(self.settings["chroot_path"]= ) -+ self.chroot_lock=3Dcatalyst_lock.LockDir(self.settings["/opt"]) ++ self.chroot_lock=3Dcatalyst_lock.LockDir("/opt") =20 def set_autoresume_path(self): self.settings["autoresume_path"]=3Dnormpath(self.settings["storedir"]= +\