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 4BDD61387B1 for ; Tue, 22 Sep 2015 00:19:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA3A5E087D; Tue, 22 Sep 2015 00:19:37 +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 6403AE087D for ; Tue, 22 Sep 2015 00:19:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27EBD3408F0 for ; Tue, 22 Sep 2015 00:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E4FE1FD for ; Tue, 22 Sep 2015 00:19:30 +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: <1442881049.510591de64c2dbca08c7ce6e27f6f3341cae8642.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/repoman/main.py X-VCS-Directories: pym/repoman/ bin/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 510591de64c2dbca08c7ce6e27f6f3341cae8642 X-VCS-Branch: master Date: Tue, 22 Sep 2015 00:19:30 +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: b136912f-72eb-411a-abd8-25ad3c4f5e13 X-Archives-Hash: cf38ac76ed579c4439f3a29ece544b69 commit: 510591de64c2dbca08c7ce6e27f6f3341cae8642 Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 22 00:17:29 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Sep 22 00:17:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=510591de repoman: Move the pythonpath modification code back into the repoman bin bin/repoman | 5 +++-- pym/repoman/main.py | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 05d842f..819e0f5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -26,8 +26,9 @@ except KeyboardInterrupt: sys.exit(1) from os import path as osp -pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") -sys.path.insert(0, pym_path) +if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): + pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") + sys.path.insert(0, pym_path) import portage portage._internal_caller = True from repoman.main import repoman_main diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 808c55e..e232558 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -8,10 +8,6 @@ import io import logging import sys -from os import path as osp -if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): - pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__)))) #, "pym") - sys.path.insert(0, pym_path) # import our centrally initialized portage instance from repoman._portage import portage portage._internal_caller = True 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 A9E761387B1 for ; Tue, 22 Sep 2015 00:22:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97C2DE087D; Tue, 22 Sep 2015 00:22:08 +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 3DF36E087D for ; Tue, 22 Sep 2015 00:22:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 314443408FF for ; Tue, 22 Sep 2015 00:22:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDB941FD for ; Tue, 22 Sep 2015 00:21:59 +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: <1442881049.510591de64c2dbca08c7ce6e27f6f3341cae8642.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/repoman/main.py X-VCS-Directories: bin/ pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 510591de64c2dbca08c7ce6e27f6f3341cae8642 X-VCS-Branch: repoman Date: Tue, 22 Sep 2015 00:21:59 +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: 150437fb-5944-422f-a540-8a7ba79844aa X-Archives-Hash: b51300d9e3af5ce3fd50a8d15377500b Message-ID: <20150922002159.saPOLEdf0_ktIKXcSDHNkUZf_Dc4SW2NOSzpgHW0Ago@z> commit: 510591de64c2dbca08c7ce6e27f6f3341cae8642 Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 22 00:17:29 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Sep 22 00:17:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=510591de repoman: Move the pythonpath modification code back into the repoman bin bin/repoman | 5 +++-- pym/repoman/main.py | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 05d842f..819e0f5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -26,8 +26,9 @@ except KeyboardInterrupt: sys.exit(1) from os import path as osp -pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") -sys.path.insert(0, pym_path) +if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): + pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") + sys.path.insert(0, pym_path) import portage portage._internal_caller = True from repoman.main import repoman_main diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 808c55e..e232558 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -8,10 +8,6 @@ import io import logging import sys -from os import path as osp -if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): - pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__)))) #, "pym") - sys.path.insert(0, pym_path) # import our centrally initialized portage instance from repoman._portage import portage portage._internal_caller = True