bin/mdw-build: Make `checkout=REV' actually work.

Collect the revision number from the checkout, and delay checking
against the changelog.

diff --git a/bin/mdw-build b/bin/mdw-build
index b4c5cfead3e22473954f86518afb630c70bda7e7..9d2dad61bda88825f39bfdbe4586a48e7d1df177 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -222,7 +222,6 @@ case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in
     cd $srcpath
     [ "$(git ls-files -m)" = "" ] ||
       warn "working tree has uncommitted changes"
     cd $srcpath
     [ "$(git ls-files -m)" = "" ] ||
       warn "working tree has uncommitted changes"

-    gitver=$(git describe --abbrev=4)

     ;;
 esac
 
     ;;
 esac
 


@@ -242,6 +241,18 @@ case "$debian,$(yesno [ -d $srcpath/debian ])" in
     ;;
 esac
 
     ;;
 esac
 

+## Maybe check out a copy of the source.
+case "$checkout" in
+  yes)
+    cd $releasepath
+    run git clone -sn $srcpath/.git _source
+    assign srcpath $releasepath/_source
+    cd $srcpath
+    run git checkout -b mdw-build $checkoutrev
+    gitver=$(git describe --abbrev=4)
+    ;;
+esac
+

 ## Check the version number.
 hack_dch_p=no
 case "$gitver,$debver" in
 ## Check the version number.
 hack_dch_p=no
 case "$gitver,$debver" in


@@ -255,17 +266,6 @@ case "$gitver,$debver" in
     ;;
 esac
 
     ;;
 esac
 

-## Maybe check out a copy of the source.
-case "$checkout" in
-  yes)
-    cd $releasepath
-    run git clone -sn $srcpath/.git _source
-    assign srcpath $releasepath/_source
-    cd $srcpath
-    run git checkout -b mdw-build $checkoutrev
-    ;;
-esac
-

 ## Maybe refresh the build machinery.
 case "$setup" in
   yes)
 ## Maybe refresh the build machinery.
 case "$setup" in
   yes)