add last known REVISION so adapter internals could work

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 5222b75151571adbb727103253a1e692fed02e4f..3861956879a11e1ec7550c37d3ded2b9a14be10b 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -429,11 +429,11 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 
 # create tempfile. as secure as possible
 tempfile() {
-       mktemp -t builder.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM.$$
+       mktemp --tmpdir -t builder.$PACKAGE_NAME.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM.$$
 }
 
 tempdir() {
-       mktemp -d builder.XXXXXX
+       mktemp --tmpdir -d builder.$PACKAGE_NAME.XXXXXX
 }
 
 # inserts git log instead of %changelog
@@ -452,10 +452,10 @@ insert_gitlog() {
        # * 1265749244 +0000 Random Hacker <nikt@pld-linux.org> 9370900
        git rev-list -${log_entries:-20} HEAD | while read sha1; do
                local logfmt='%B%n'
-               git notes list $sha1 &> /dev/null && logfmt=%N
+               git notes list $sha1 > /dev/null 2>&1 && logfmt=%N
                git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n${logfmt}%n" --date=raw | sed '/^$/q'
        done > $gitlog
-       gawk '/^\* /{printf("* %s %s\n", strftime("%a %b %d %Y", $2), substr($0, length($1)+length($2)+length($3)+4)); next}{print}' $gitlog > $speclog
+       LC_ALL=C gawk '/^\* /{printf("* %s %s\n", strftime("%a %b %d %Y", $2), substr($0, length($1)+length($2)+length($3)+4)); next}{print}' $gitlog > $speclog
        sed '/^%changelog/,$d' $SPECFILE | sed -e "\${
                        a%changelog
                        r $speclog
@@ -2491,8 +2491,8 @@ case "$COMMAND" in
                                        cmd_branches="git show-ref"
                                        ref_prefix=refs/remotes/${REMOTE_PLD}
                                fi
-                               TAG_STATUS=$($cmd_branches | grep -i "${ref_prefix}/$TAG_BRANCH$")
-                               if [ -n "$TAG_STATUS" -a "$TAG_STATUS" != "$CVSTAG" ]; then
+                               TAG_STATUS=$($cmd_branches | grep -i "${ref_prefix}/$TAG_BRANCH$" | cut -c'-40')
+                               if [ -n "$TAG_STATUS" -a "$TAG_STATUS" != $(git rev-parse "$CVSTAG") ]; then
                                        Exit_error err_branch_exists "$TAG_STATUS"
                                fi
                        fi