[PATCH 9/9] PBUILDER_SYSCONFDIR back to /etc

Loïc Minier lool at dooz.org
Sun Jan 17 14:37:05 UTC 2010


test suite does not like symlink
---
 pbuilder-loadconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pbuilder-loadconfig b/pbuilder-loadconfig
index b1bdcd5..09c6020 100644
--- a/pbuilder-loadconfig
+++ b/pbuilder-loadconfig
@@ -18,13 +18,13 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 export PBUILDER_PKGDATADIR="${PBUILDER_PKGDATADIR:-$PBUILDER_ROOT/usr/share/pbuilder}"
-export PBUILDER_SYSCONFDIR="${PBUILDER_SYSCONFDIR:-$PBUILDER_ROOT/etc/pbuilder}"
+export PBUILDER_SYSCONFDIR="${PBUILDER_SYSCONFDIR:-$PBUILDER_ROOT/etc}"
 export PBUILDER_CACHEDIR="${PBUILDER_CACHEDIR:-$PBUILDER_ROOT/var/cache/pbuilder}"
 
 for RCFILE in \
     "${PBUILDER_PKGDATADIR}/pbuilderrc" \
     "${PBUILDER_SYSCONFDIR}/pbuilderrc" \
-    "${PROFILE:+$PBUILDER_SYSCONFDIR/$PROFILE.rc}" \
+    "${PROFILE:+$PBUILDER_SYSCONFDIR/pbuilder/$PROFILE.rc}" \
     "${HOME}/.pbuilderrc"; do
     if [ -z "$RCFILE" ]; then 
         : # If no profile set, do nothing and normal
-- 
1.6.5



More information about the Pbuilder-maint mailing list