[cowdancer] 10/11: qemubuilder.c: Delete /pbuilder-run before version check

[James Clarke]

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

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit ce58a35d60714e7fea640fafbca0bd8f0314f2b8
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Mon May 2 01:08:46 2016 +0100

    qemubuilder.c: Delete /pbuilder-run before version check
---
 qemubuilder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemubuilder.c b/qemubuilder.c
index 63c91d2..e8e32cd 100755
--- a/qemubuilder.c
+++ b/qemubuilder.c
@@ -753,6 +753,8 @@ static int run_second_stage_script
 	  /* main code */
 	  "echo \n"
 	  "echo ' -> qemu-pbuilder second-stage' \n"
+	  // Remove compatibility symlink
+	  "rm \"$BUILDDIR\"/pbuilder-run\n"
 	  //"mount -n /proc /proc -t proc\n" // this is done in first stage.
 	  "if [ \"${PBUILDER_INIT_VERSION:-0}\" -lt "XSTR(PBUILDER_INIT_VERSION)" ]; then\n"
 	  "    echo \"E: qemubuilder init script is out of date (${PBUILDER_INIT_VERSION:-0} < "XSTR(PBUILDER_INIT_VERSION)")\"\n"
@@ -762,8 +764,6 @@ static int run_second_stage_script
 	  "    echo \"E: qemubuilder init script is newer than expected (${PBUILDER_INIT_VERSION:-0} < "XSTR(PBUILDER_INIT_VERSION)")\"\n"
 	  "    exit_from_qemu 1\n"
 	  "fi\n"
-	  // Remove compatibility symlink
-	  "rm \"$BUILDDIR\"/run-pbuilder\n"
 	  "echo '  -> setting time to %s' \n"
 	  "date --set=\"%s\"\n"
 	  "echo '  -> configuring network' \n"

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