dispatch-conf: substitute ${EPREFIX} archive-dir

This allows prefix installs to avoid hardcoding archive-dir.

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index c4ab33f990dc41f807a2a1597025200e2495e0e5..7eea44c8e46a1730b071906728cd25ef1d56a020 100644 (file)
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -3,7 +3,7 @@
 #
 
 # Directory to archive replaced configs
-archive-dir=/etc/config-archive
+archive-dir=${EPREFIX}/etc/config-archive
 
 # Use rcs for storing files in the archive directory?
 # WARNING: When configured to use rcs, read and execute permissions of

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index f5beba5c01f205ea436c0f471308c8833356e68c..abd3ac1416d920ff1b642c8f6dd62ce44ff64476 100644 (file)
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -13,6 +13,7 @@ import os, sys, shutil
 import portage
 from portage.env.loaders import KeyValuePairFileLoader
 from portage.localization import _
+from portage.util import varexpand
 
 RCS_BRANCH = '1.1.1'
 RCS_LOCK = 'rcs -ko -M -l'
@@ -59,6 +60,10 @@ def read_config(mandatory_opts):
             else:
                 print(_('dispatch-conf: Missing option "%s" in /etc/dispatch-conf.conf; fatal') % (key,), file=sys.stderr)
 
+    # archive-dir supports ${EPREFIX} expansion, in order to avoid hardcoding
+    variables = {"EPREFIX": eprefix}
+    opts['archive-dir'] = varexpand(opts['archive-dir'], mydict=variables)
+
     if not os.path.exists(opts['archive-dir']):
         os.mkdir(opts['archive-dir'])
         # Use restrictive permissions by default, in order to protect