diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-10-07 09:27:21 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-10-07 09:27:21 +0200 |
| commit | c743ef392700ff148fe8898c7e23290950d03725 (patch) | |
| tree | 33875f362ffc411726118d66f45c42f8f27edbd8 | |
| parent | d62fadd27e41a1b69cc431460be5e864ae5be80e (diff) | |
| parent | b79eae8d30a4355b01ae6332e1b79c238233ba7e (diff) | |
Merge branch 'master' into experimental
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | git-pbuilder | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 550594c..ab4d4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-buildpackage (0.5.10) unstable; urgency=low + + * [4b23f2d] Warn if not invoked by git-buildpackage git-pbuilder is + supposed to be invoked by git-buildpackage. Otherwise things like + export-dir aren't respected. (Closes: #596625) + + -- Guido Günther <agx@sigxcpu.org> Mon, 27 Sep 2010 09:46:52 +0200 + git-buildpackage (0.5.9) experimental; urgency=low * [6a200ad] Resync with git-pbuilder 0.16 (Closes: #595055) diff --git a/debian/rules b/debian/rules index b81ad94..090da6c 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ binary-post-install/git-buildpackage:: clean:: -rm git-*.py gbp-*.py - -rm docs/*.1 docs/manpage.* $(VERSION_ENT) + -rm docs/*.1 docs/manpage.* $(VERSION_ENT) git-pbuilder.1 -rm -r docs/manual-html/ .PHONY: checks diff --git a/git-pbuilder b/git-pbuilder index 3d57ffb..50443c7 100755 --- a/git-pbuilder +++ b/git-pbuilder @@ -91,6 +91,11 @@ update|create|login) sudo cowbuilder --"$action" --basepath "$BASE" --dist "$DIST" $OPTIONS "$@" exit $? ;; +*) + if [ -z "$GBP_BUILD_DIR" ]; then + echo "WARNING: not invoked by git-buildpackage." >&2 + fi + ;; esac # Now we can finally run pdebuild. The quoting here is tricky, but this |