From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 16 Jan 2011 15:40:20 +0000 (-0800)
Subject: repoman: fix PORTDIR consistency for herds.xml
X-Git-Tag: v2.1.9.32~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cd3e7322921667d893ffe86c025a1b09d010586;p=portage.git

repoman: fix PORTDIR consistency for herds.xml

This fixes a case in which repoman could use the PORTDIR setting in
make.conf to grab herds.xml, even though cwd refers to a different
path (cvs tree rather than rsync tree).
---

diff --git a/bin/repoman b/bin/repoman
index 8c926ca41..3938f49cf 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -578,6 +578,8 @@ portdir_overlay = os.path.realpath(portdir_overlay)
 repo_info = portdb._repo_info[portdir_overlay]
 portdb.porttrees = list(repo_info.eclass_db.porttrees)
 portdir = portdb.porttrees[0]
+repoman_settings['PORTDIR'] = portdir
+repoman_settings.backup_changes('PORTDIR')
 
 # Generate an appropriate PORTDIR_OVERLAY value for passing into the
 # profile-specific config constructor calls.