Mercurial > hg
comparison contrib/packaging/buildrpm @ 39454:c68cfc55af9d stable
buildrpm: fix embarassing bug in shell variable expansions
`$distance_$node` looks up and concatenates `$distance_` and
`$node`. `$distance_` is empty, so we were getting the node without
the distance. Using the curly braces makes our intent explicit and
produces better-versioned RPMS.
Differential Revision: https://phab.mercurial-scm.org/D4493
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Wed, 05 Sep 2018 16:29:31 -0400 |
parents | b7cd9e94c259 |
children | 6af7765bdb7c |
comparison
equal
deleted
inserted
replaced
39424:094d1f42c484 | 39454:c68cfc55af9d |
---|---|
57 else | 57 else |
58 release=0.9_$type | 58 release=0.9_$type |
59 fi | 59 fi |
60 | 60 |
61 if [ -n "$distance" ] ; then | 61 if [ -n "$distance" ] ; then |
62 release=$release+$distance_$node | 62 release=$release+${distance}_${node} |
63 fi | 63 fi |
64 | 64 |
65 if [ "$PYTHONVER" ]; then | 65 if [ "$PYTHONVER" ]; then |
66 release=$release+$PYTHONVER | 66 release=$release+$PYTHONVER |
67 RPMPYTHONVER=$PYTHONVER | 67 RPMPYTHONVER=$PYTHONVER |