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 20F5013877A for ; Tue, 19 Aug 2014 12:18:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9566E0A03; Tue, 19 Aug 2014 12:18:05 +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 B6A97E0ABD for ; Tue, 19 Aug 2014 12:17:46 +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 ADE71340395 for ; Tue, 19 Aug 2014 12:17:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCDE53BAE for ; Tue, 19 Aug 2014 07:01:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1407101925.96ded9cff423d773ee31a696a691dd6610c315b7.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/const.py pym/portage/dbapi/__init__.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ pym/portage/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 96ded9cff423d773ee31a696a691dd6610c315b7 X-VCS-Branch: master Date: Tue, 19 Aug 2014 07:01:04 +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: 33fd102a-a298-4a41-9773-8783375cf3e8 X-Archives-Hash: b5ba28e5a84978f88d5ea037d1f216c6 commit: 96ded9cff423d773ee31a696a691dd6610c315b7 Author: Pavel Kazakov gentoo org> AuthorDate: Sun Aug 3 21:38:45 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 3 21:38:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=96ded9cf Move -MERGING- string to a constant. Remove extra whitespace. --- pym/portage/const.py | 1 + pym/portage/dbapi/__init__.py | 4 +++- pym/portage/dbapi/vartree.py | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/portage/const.py b/pym/portage/const.py index 1785bff..50f0719 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -74,6 +74,7 @@ MOVE_BINARY = "/bin/mv" PRELINK_BINARY = "/usr/sbin/prelink" INVALID_ENV_FILE = "/etc/spork/is/not/valid/profile.env" +MERGING_IDENTIFIER = "-MERGING-" REPO_NAME_FILE = "repo_name" REPO_NAME_LOC = "profiles" + "/" + REPO_NAME_FILE diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index a20a1e8..6638352 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -16,6 +16,8 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.versions:catsplit,catpkgsplit,vercmp,_pkg_str', ) +from portage.const import MERGING_IDENTIFIER + from portage import os from portage import auxdbkeys from portage.eapi import _get_eapi_attrs @@ -278,7 +280,7 @@ class dbapi(object): return True def invalidentry(self, mypath): - if '/-MERGING-' in mypath: + if MERGING_IDENTIFIER in mypath: if os.path.exists(mypath): writemsg(colorize("BAD", _("INCOMPLETE MERGE:"))+" %s\n" % mypath, noiselevel=-1) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 4a27092..1984a66 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -45,7 +45,7 @@ portage.proxy.lazyimport.lazyimport(globals(), ) from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \ - PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH + MERGING_IDENTIFIER, PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH from portage.dbapi import dbapi from portage.exception import CommandNotFound, \ InvalidData, InvalidLocation, InvalidPackageName, \ @@ -104,7 +104,7 @@ class vardbapi(dbapi): _excluded_dirs = ["CVS", "lost+found"] _excluded_dirs = [re.escape(x) for x in _excluded_dirs] - _excluded_dirs = re.compile(r'^(\..*|-MERGING-.*|' + \ + _excluded_dirs = re.compile(r'^(\..*|' + MERGING_IDENTIFIER + '.*|' + \ "|".join(_excluded_dirs) + r')$') _aux_cache_version = "1" @@ -446,7 +446,7 @@ class vardbapi(dbapi): if self._excluded_dirs.match(y) is not None: continue subpath = x + "/" + y - # -MERGING- should never be a cpv, nor should files. + # MERGING_IDENTIFIER should never be a cpv, nor should files. try: if catpkgsplit(subpath) is None: self.invalidentry(self.getpath(subpath)) @@ -1504,7 +1504,7 @@ class dblink(object): self.dbroot = normalize_path(os.path.join(self._eroot, VDB_PATH)) self.dbcatdir = self.dbroot+"/"+cat self.dbpkgdir = self.dbcatdir+"/"+pkg - self.dbtmpdir = self.dbcatdir+"/-MERGING-"+pkg + self.dbtmpdir = self.dbcatdir+MERGING_IDENTIFIER+pkg self.dbdir = self.dbpkgdir self.settings = mysettings self._verbose = self.settings.get("PORTAGE_VERBOSE") == "1"