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 78E2213877A for ; Mon, 16 Jun 2014 03:37:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 304D8E0BBD; Mon, 16 Jun 2014 03:37:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FF0EE0BA9 for ; Mon, 16 Jun 2014 03:37:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31F2D33FF9F for ; Mon, 16 Jun 2014 03:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CF373187ED for ; Mon, 16 Jun 2014 03:37:29 +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: <1402792601.70e221ba1921d2275bbd415e20a5d9923d329b44.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:gsoc2014 commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/git.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 70e221ba1921d2275bbd415e20a5d9923d329b44 X-VCS-Branch: gsoc2014 Date: Mon, 16 Jun 2014 03:37:29 +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: ccc86a32-0bd7-4150-9b2c-fee103081685 X-Archives-Hash: 3598178762ccd943243676616570c247 commit: 70e221ba1921d2275bbd415e20a5d9923d329b44 Author: Devan Franchini gentoo org> AuthorDate: Tue Jun 10 22:18:23 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=70e221ba git.py: Adds module branch support --- layman/overlays/git.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/layman/overlays/git.py b/layman/overlays/git.py index 2f4bd61..f3ada66 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -26,6 +26,8 @@ __version__ = "$Id: git.py 146 2006-05-27 09:52:36Z wrobel $" # #------------------------------------------------------------------------------- +import xml.etree.ElementTree as ET + from layman.utils import path from layman.overlays.source import OverlaySource, require_supported @@ -44,7 +46,7 @@ class GitOverlay(OverlaySource): def __init__(self, parent, config, _location, ignore = 0): super(GitOverlay, self).__init__(parent, config, _location, ignore) - self.branch = None + self.branch = self.parent.branch def _fix_git_source(self, source): @@ -76,6 +78,10 @@ class GitOverlay(OverlaySource): args.append(cfg_opts) args.append(self._fix_git_source(self.src)) args.append(target) + + if self.branch: + args.append('-b') + args.append(self.branch) success = False # adding cwd=base due to a new git bug in selinux due to # not having user_home_dir_t and portage_fetch_t permissions 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 4997813877A for ; Mon, 16 Jun 2014 03:40:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22494E0B77; Mon, 16 Jun 2014 03:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4F5EE0B52 for ; Mon, 16 Jun 2014 03:40:22 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E645333FDA9 for ; Mon, 16 Jun 2014 03:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id AB46B187ED for ; Mon, 16 Jun 2014 03:40:19 +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: <1402792601.70e221ba1921d2275bbd415e20a5d9923d329b44.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/git.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 70e221ba1921d2275bbd415e20a5d9923d329b44 X-VCS-Branch: master Date: Mon, 16 Jun 2014 03:40:19 +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: 5251fe5f-89d6-48c3-8482-9cf0384b30a6 X-Archives-Hash: c87969d71ccfd8dff179035c387002a4 Message-ID: <20140616034019.kKJdMH5y98NRfkmb_Hc4RtFNErMTKyYAHDNpOPKY_II@z> commit: 70e221ba1921d2275bbd415e20a5d9923d329b44 Author: Devan Franchini gentoo org> AuthorDate: Tue Jun 10 22:18:23 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=70e221ba git.py: Adds module branch support --- layman/overlays/git.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/layman/overlays/git.py b/layman/overlays/git.py index 2f4bd61..f3ada66 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -26,6 +26,8 @@ __version__ = "$Id: git.py 146 2006-05-27 09:52:36Z wrobel $" # #------------------------------------------------------------------------------- +import xml.etree.ElementTree as ET + from layman.utils import path from layman.overlays.source import OverlaySource, require_supported @@ -44,7 +46,7 @@ class GitOverlay(OverlaySource): def __init__(self, parent, config, _location, ignore = 0): super(GitOverlay, self).__init__(parent, config, _location, ignore) - self.branch = None + self.branch = self.parent.branch def _fix_git_source(self, source): @@ -76,6 +78,10 @@ class GitOverlay(OverlaySource): args.append(cfg_opts) args.append(self._fix_git_source(self.src)) args.append(target) + + if self.branch: + args.append('-b') + args.append(self.branch) success = False # adding cwd=base due to a new git bug in selinux due to # not having user_home_dir_t and portage_fetch_t permissions