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 CDCC41381F3 for ; Mon, 22 Jul 2013 22:32:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59318E09C6; Mon, 22 Jul 2013 22:32:34 +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 CF0C9E09C6 for ; Mon, 22 Jul 2013 22:32:33 +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 A1F0233DAC0 for ; Mon, 22 Jul 2013 22:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3D214E5458 for ; Mon, 22 Jul 2013 22:32:31 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1374532239.4b6c930ca908b3e6c0c56ca099310ba79398580c.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py pym/portage/const.py X-VCS-Directories: pym/portage/ pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 4b6c930ca908b3e6c0c56ca099310ba79398580c X-VCS-Branch: master Date: Mon, 22 Jul 2013 22:32:31 +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: baffc36b-a9ed-4cd1-a3c8-26e6e04495c8 X-Archives-Hash: 4068bf29556d707cc80359e56db0f2d6 commit: 4b6c930ca908b3e6c0c56ca099310ba79398580c Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Jul 22 22:30:39 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail com> CommitDate: Mon Jul 22 22:30:39 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4b6c930c Move hardcoded atoms of cvs, git and rsync to portage.const module and fix category of git atom. --- pym/_emerge/actions.py | 6 +++--- pym/portage/const.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 80afb0b..11a8698 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2112,7 +2112,7 @@ def _sync_repo(repo, settings, trees, myopts): # git directly. if portage.process.find_binary("git") is None: msg = ["Command not found: git", - "Type \"emerge dev-util/git\" to enable git support."] + "Type \"emerge %s\" to enable git support." % portage.const.GIT_PACKAGE_ATOM] for l in msg: writemsg_level("!!! %s\n" % l, level=logging.ERROR, noiselevel=-1) @@ -2140,7 +2140,7 @@ def _sync_repo(repo, settings, trees, myopts): rsync_binary = portage.process.find_binary("rsync") if rsync_binary is None: print("!!! /usr/bin/rsync does not exist, so rsync support is disabled.") - print("!!! Type \"emerge net-misc/rsync\" to enable rsync support.") + print("!!! Type \"emerge %s\" to enable rsync support." % portage.const.RSYNC_PACKAGE_ATOM) return os.EX_UNAVAILABLE mytimeout=180 @@ -2540,7 +2540,7 @@ def _sync_repo(repo, settings, trees, myopts): elif repo.sync_type == "cvs": if not os.path.exists("/usr/bin/cvs"): print("!!! /usr/bin/cvs does not exist, so CVS support is disabled.") - print("!!! Type \"emerge dev-vcs/cvs\" to enable CVS support.") + print("!!! Type \"emerge %s\" to enable CVS support." % portage.const.CVS_PACKAGE_ATOM) return os.EX_UNAVAILABLE cvs_root = syncuri if cvs_root.startswith("cvs://"): diff --git a/pym/portage/const.py b/pym/portage/const.py index 087c0e7..c05b1c0 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -79,6 +79,9 @@ REPO_NAME_LOC = "profiles" + "/" + REPO_NAME_FILE PORTAGE_PACKAGE_ATOM = "sys-apps/portage" LIBC_PACKAGE_ATOM = "virtual/libc" OS_HEADERS_PACKAGE_ATOM = "virtual/os-headers" +CVS_PACKAGE_ATOM = "dev-vcs/cvs" +GIT_PACKAGE_ATOM = "dev-vcs/git" +RSYNC_PACKAGE_ATOM = "net-misc/rsync" INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", "FEATURES", "ACCEPT_KEYWORDS",