diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-01-19 18:53:47 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-01-19 18:54:21 +0100 |
| commit | 24e1f24cff9b75bf53a4d3551fa56294aaaa3c57 (patch) | |
| tree | 70f0cdefbcf099638703325e747e5fbaa7396e01 | |
| parent | b863399aa94e5ec4cdd7c60f131fb229b8f3b7b0 (diff) | |
Revert "git-pbuilder: Pass --debbuildopts to pbuilder instead of pdebuild"
This reverts commit 5211ab98f09f77082841538a1b3db935b2f21a2f.
pdebuild needs some more work to fully support this.
Reopens: #851657
| -rw-r--r-- | bin/git-pbuilder | 10 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/bin/git-pbuilder b/bin/git-pbuilder index caa28d7c..e67698de 100644 --- a/bin/git-pbuilder +++ b/bin/git-pbuilder @@ -327,13 +327,11 @@ done # Now we can finally run pdebuild. The quoting here is tricky, but this # seems to pass everything through properly. if [ no = "$GIT_PBUILDER_AUTOCONF" ] ; then - pdebuild \ - --pbuilder "$BUILDER" "${PDEBUILDOPTS[@]}" -- \ - --debbuildopts "$DEBBUILDOPTS" "${OPTIONS[@]}" + pdebuild --pbuilder "$BUILDER" --debbuildopts "$DEBBUILDOPTS" \ + "${PDEBUILDOPTS[@]}" -- "${OPTIONS[@]}" else - pdebuild --buildresult "$OUTPUT_DIR" \ - --pbuilder "$BUILDER" "${PDEBUILDOPTS[@]}" -- \ - --debbuildopts "$DEBBUILDOPTS" "${OPTIONS[@]}" + pdebuild --buildresult "$OUTPUT_DIR" --pbuilder "$BUILDER" \ + --debbuildopts "$DEBBUILDOPTS" "${PDEBUILDOPTS[@]}" -- "${OPTIONS[@]}" fi exit "$?" diff --git a/debian/control b/debian/control index 56bd60bd..fd7d621c 100644 --- a/debian/control +++ b/debian/control @@ -56,7 +56,6 @@ Recommends: pristine-tar (>= 0.5), cowbuilder | pbuilder | sbuild, python-requests Suggests: python-notify, unzip, sudo -Breaks: pbuilder (<< 0.228~) Description: Suite to help with Debian packages in Git repositories This package contains the following tools: * gbp import-{dsc,dscs}: import existing Debian source packages into a git |