aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-11-25 23:16:36 +0000
committerMattia Rizzolo <mattia@mapreri.org>2015-11-25 23:45:12 +0000
commit1777fdaa90bc28b75a3685fd7de789e2dec97b87 (patch)
tree5389b69f34f7fa9b05a348d7fb81de170df9afaa
parent3ae99eb88322b98847ee6cbd451991e74aae6600 (diff)
downloadpbuilder-1777fdaa90bc28b75a3685fd7de789e2dec97b87.tar
pbuilder-1777fdaa90bc28b75a3685fd7de789e2dec97b87.tar.gz
pdebuild-internal: revert back to plain log() instead of log.{i,e}()
This makes possible to use a new pbuilder outside the choot and a old pbuilder inside. We can't just source the modules and use log.{i,w,e} since we don't know if the pbuilder version inside the chroot is new enough. Gbp-Dch: Short
-rw-r--r--pdebuild-internal7
1 files changed, 5 insertions, 2 deletions
diff --git a/pdebuild-internal b/pdebuild-internal
index 562be0d..b737216 100644
--- a/pdebuild-internal
+++ b/pdebuild-internal
@@ -39,6 +39,9 @@ cd "$1"
shift;
# dummy function that does enough, real one is defined elsewhere.
+# We don't deal with LOGLEVEL here, though.
+# We can't just source the modules and use log.{i,w,e} since we don't know if
+# the pbuilder version inside the chroot is new enough.
function log() {
echo "$*"
}
@@ -48,7 +51,7 @@ while [ -n "$1" ]; do
--debbuildopts)
# append to DEBBUILDOPTS or reset to empty if $2 isn't set
DEBBUILDOPTS="${2:+${DEBBUILDOPTS:+$DEBBUILDOPTS }$2}";
- log.i "Setting DEBBUILDOPTS=$DEBBUILDOPTS"
+ log "I: Setting DEBBUILDOPTS=$DEBBUILDOPTS"
shift; shift;
;;
--uid)
@@ -69,7 +72,7 @@ while [ -n "$1" ]; do
shift;
;;
--*)
- log.e "Unknown option [$1] was specified "
+ log "E: Unknown option [$1] was specified "
exit 1;
;;
*)