summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-01-16 07:40:20 -0800
committerZac Medico <zmedico@gentoo.org>2011-01-16 07:40:20 -0800
commit6cd3e7322921667d893ffe86c025a1b09d010586 (patch)
treec296169ef111744fce0a1e6d5439544a82074f77
parentc3febf7884e768aa0a8d909fa3fb1de8a4aa89a0 (diff)
downloadportage-6cd3e7322921667d893ffe86c025a1b09d010586.tar.gz
portage-6cd3e7322921667d893ffe86c025a1b09d010586.tar.bz2
portage-6cd3e7322921667d893ffe86c025a1b09d010586.zip
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).
-rwxr-xr-xbin/repoman2
1 files changed, 2 insertions, 0 deletions
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.