Gentoo Archives: gentoo-portage-dev

From: Pavel Kazakov <nullishzero@g.o>
To: gentoo-portage-dev@l.g.o
Subject: Re: [gentoo-portage-dev] [PATCH 1/3] Move -MERGING- string to a constant variable.
Date: Thu, 13 Mar 2014 07:18:16
Message-Id: 53215BB4.8070903@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 1/3] Move -MERGING- string to a constant variable. by Pavel Kazakov
1 On 03/12/14 23:10, Pavel Kazakov wrote:
2 > ---
3 > pym/portage/const.py | 1 +
4 > pym/portage/dbapi/__init__.py | 4 +++-
5 > pym/portage/dbapi/vartree.py | 8 ++++----
6 > 3 files changed, 8 insertions(+), 5 deletions(-)
7 ...
8 > @@ -1504,7 +1504,7 @@ class dblink(object):
9 > self.dbroot = normalize_path(os.path.join(self._eroot, VDB_PATH))
10 > self.dbcatdir = self.dbroot+"/"+cat
11 > self.dbpkgdir = self.dbcatdir+"/"+pkg
12 > - self.dbtmpdir = self.dbcatdir+"/-MERGING-"+pkg
13 > + self.dbtmpdir = self.dbcatdir+MERGING_IDENTIFIER+pkg
14 > self.dbdir = self.dbpkgdir
15 > self.settings = mysettings
16 > self._verbose = self.settings.get("PORTAGE_VERBOSE") == "1"
17
18 Just a quick update (don't want to re-submit the patches): I've squashed
19 patches 1 and 2, and changed commit message to 'Move -MERGING- string to
20 a constant.'
21
22 Regards,
23 Pavel