From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 22BC01387B2 for ; Mon, 6 Jan 2014 02:00:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7E18E0A90; Mon, 6 Jan 2014 02:00:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60D7CE0A90 for ; Mon, 6 Jan 2014 02:00:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3750D33F71D for ; Mon, 6 Jan 2014 02:00:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AB479E54AB for ; Mon, 6 Jan 2014 02:00:50 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388450333.5f0fce9876dea3f8fdc7127f7658239792cb526b.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5f0fce9876dea3f8fdc7127f7658239792cb526b X-VCS-Branch: master Date: Mon, 6 Jan 2014 02:00:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0fba48db-d299-4d37-b5df-6141c2decfef X-Archives-Hash: 493ee46fb7b3cf8c66dd19a1f02e5aee commit: 5f0fce9876dea3f8fdc7127f7658239792cb526b Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 15 22:53:32 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 00:38:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5f0fce98 modules/generic_stage_target.py: Use portdir, distdir, ... instead of paths for keys If snapcache is enabled, self.mounts and self.mountmap had not been modified like they were if it was not enabled. Added a print statement for debugging to be converted to logging in the future. --- modules/generic_stage_target.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 3e60f72..6c8cdbc 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -174,10 +174,10 @@ class generic_stage_target(generic_target): """ Setup our mount points """ if "SNAPCACHE" in self.settings: - self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"] - self.mountmap={"/proc":"/proc","/dev":"/dev","devpts":"/dev/pts", - "/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\ - "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"} + self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"] + self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts", + "portdir": self.settings["snapshot_cache_path"] + "/portage", + "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"} else: self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", @@ -904,7 +904,8 @@ class generic_stage_target(generic_target): os.makedirs(self.mountmap[x],0755) src=self.mountmap[x] - if "SNAPCACHE" in self.settings and x == "/usr/portage": + #print "bind(); src =", src + if "SNAPCACHE" in self.settings and x == "portdir": self.snapshot_lock_object.read_lock() if os.uname()[0] == "FreeBSD": if src == "/dev": From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 61CCA138247 for ; Tue, 31 Dec 2013 04:22:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DB40E0997; Tue, 31 Dec 2013 04:22:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89CEFE0997 for ; Tue, 31 Dec 2013 04:22:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD8BA33F347 for ; Tue, 31 Dec 2013 04:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9BEB1E545E for ; Tue, 31 Dec 2013 04:22:09 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388450333.5f0fce9876dea3f8fdc7127f7658239792cb526b.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5f0fce9876dea3f8fdc7127f7658239792cb526b X-VCS-Branch: pending Date: Tue, 31 Dec 2013 04:22:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 29835763-7418-47bd-964c-9b268a92657e X-Archives-Hash: 9c62c505245a51b1cfd03fdc3f32e830 Message-ID: <20131231042209.Kvw_PiBfMHOetba7vx89BcoiMHepg_ZaDBYkCXxXbKE@z> commit: 5f0fce9876dea3f8fdc7127f7658239792cb526b Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 15 22:53:32 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 00:38:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5f0fce98 modules/generic_stage_target.py: Use portdir, distdir, ... instead of paths for keys If snapcache is enabled, self.mounts and self.mountmap had not been modified like they were if it was not enabled. Added a print statement for debugging to be converted to logging in the future. --- modules/generic_stage_target.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 3e60f72..6c8cdbc 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -174,10 +174,10 @@ class generic_stage_target(generic_target): """ Setup our mount points """ if "SNAPCACHE" in self.settings: - self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"] - self.mountmap={"/proc":"/proc","/dev":"/dev","devpts":"/dev/pts", - "/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\ - "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"} + self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"] + self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts", + "portdir": self.settings["snapshot_cache_path"] + "/portage", + "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"} else: self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", @@ -904,7 +904,8 @@ class generic_stage_target(generic_target): os.makedirs(self.mountmap[x],0755) src=self.mountmap[x] - if "SNAPCACHE" in self.settings and x == "/usr/portage": + #print "bind(); src =", src + if "SNAPCACHE" in self.settings and x == "portdir": self.snapshot_lock_object.read_lock() if os.uname()[0] == "FreeBSD": if src == "/dev":