diff options
| -rwxr-xr-x | pbuilder-checkparams | 5 | ||||
| -rw-r--r-- | pbuilder-modules | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pbuilder-checkparams b/pbuilder-checkparams index cadd24b..47e4613 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -28,6 +28,7 @@ INTERNAL_BUILD_UML="" CHROOTEXEC="" OVERRIDE_APTLINES="no" +OVERRIDE_APTLINES_WARN="" # set this if --override-config option should be set. BINARY_ARCH="no" PBUILDER_BUILD_LOGFILE= PRESERVE_BUILDPLACE="no" @@ -62,10 +63,12 @@ while [ -n "$1" ]; do ;; --mirror) MIRRORSITE="$2"; + OVERRIDE_APTLINES_WARN=yes shift; shift; ;; --othermirror) OTHERMIRROR="$2"; + OVERRIDE_APTLINES_WARN=yes shift; shift; ;; --http-proxy) @@ -74,10 +77,12 @@ while [ -n "$1" ]; do ;; --distribution) DISTRIBUTION="$2"; + OVERRIDE_APTLINES_WARN=yes shift; shift; ;; --components) COMPONENTS="$2"; + OVERRIDE_APTLINES_WARN=yes shift; shift; ;; --buildresult) diff --git a/pbuilder-modules b/pbuilder-modules index 26626f9..74210b7 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -395,6 +395,10 @@ function extractbuildplace () { # installaptlines may fail with exit 1, do it earlier than mountproc. if [ "$OVERRIDE_APTLINES" = "yes" ]; then installaptlines + else # Warn if override config is not set + if [ "$OVERRIDE_APTLINES_WARN" = "yes" ]; then + echo "W: --override-config is not set; not updating apt.conf Read the manpage for details." + fi fi mountproc |