[devscripts] 01/01: debrepro: make second build with disorderfs at the same location

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository devscripts.

commit c3ba6fc47120199e1dd5bceb3ea0ace969e58bbf
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 2 12:33:08 2017 -0300

    debrepro: make second build with disorderfs at the same location
---
 debian/changelog    |  8 ++++++++
 scripts/debrepro.sh | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27b05d5..635636e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,14 @@ devscripts (2.17.7) UNRELEASED; urgency=medium
   * debpatch:
     + New script, Apply a debdiff to a Debian source package. (Closes: #845659)
 
+  [ Antonio Terceiro ]
+  * debrepro:
+    + When applying disorderfs to the second build, make sure the final path
+      from where the package is built is the same as in the first build, to
+      avoid differences in binaries due to the build path. There is no good
+      solution for making builds independent of build path yet, so the current
+      practice is to run both builds at the same location.
+
  -- Paul Wise <pabs at debian.org>  Sat, 17 Jun 2017 13:11:35 +0800
 
 devscripts (2.17.6) unstable; urgency=medium
diff --git a/scripts/debrepro.sh b/scripts/debrepro.sh
index 298d25a..5db1888 100755
--- a/scripts/debrepro.sh
+++ b/scripts/debrepro.sh
@@ -112,10 +112,12 @@ create_build_script() {
         'export TZ=Asia/Tokyo'
 
     if which disorderfs >/dev/null; then
-        disorderfs_commands='mkdir ../disorderfs &&
-disorderfs --shuffle-dirents=yes $(pwd) ../disorderfs &&
-trap "cd .. && fusermount -u disorderfs && rmdir disorderfs" INT TERM EXIT &&
-cd ../disorderfs'
+        disorderfs_commands='cd .. &&
+mv source orig &&
+mkdir source &&
+disorderfs --shuffle-dirents=yes orig source &&
+trap "cd .. && fusermount -u source && rmdir source && mv orig source" INT TERM EXIT &&
+cd source'
         vary filesystem-ordering \
             '' \
             "$disorderfs_commands"

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