[pbuilder] 03/03: pdebuild: Use new get_source_options function

James Clarke jrtc27 at moszumanska.debian.org
Tue Jan 24 14:49:34 UTC 2017


This is an automated email from the git hooks/post-receive script.

jrtc27 pushed a commit to branch master
in repository pbuilder.

commit 545779f4eea780fc9483d41ef0d8ea0dd18805b5
Author: James Clarke <jrtc27 at debian.org>
Date:   Tue Jan 24 14:32:30 2017 +0000

    pdebuild: Use new get_source_options function
    
    Closes: #852442
---
 pdebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pdebuild b/pdebuild
index 7380c8c..7d5f5ed 100644
--- a/pdebuild
+++ b/pdebuild
@@ -81,20 +81,21 @@ else
     if ! dpkg-checkbuilddeps -B ; then
         log.w "Unmet build-dependency in source"
     fi
-    dpkg-source --before-build .
+    # get_changes_options/get_source_options single-quote each element, so an
+    # eval is needed to reverse that.
+    SOURCE_OPTIONS=$(get_source_options)
+    eval dpkg-source ${SOURCE_OPTIONS} --before-build .
     if should_clean_source; then
         "${BUILDSOURCEROOTCMD}" debian/rules clean
     fi
-    dpkg-source -b .
+    eval dpkg-source ${SOURCE_OPTIONS} -b .
     if ! [ "../${DSC}" -ef "${BUILDRESULT}/${DSC}" ]; then
         log.i "Generating source changes file for original dsc"
-        # get_changes_options single-quotes each element, so an eval is needed
-        # to reverse that.
         eval dpkg-genchanges -S $(get_changes_options) > "../${SOURCE_CHANGES}"
     else
         log.i "Generated dsc will be overwritten by build result; not generating changes file"
     fi
-    dpkg-source --after-build .
+    eval dpkg-source ${SOURCE_OPTIONS} --after-build .
     ${PBUILDERROOTCMD} \
         ${PDEBUILD_PBUILDER} \
         --build \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git



More information about the Pbuilder-maint mailing list