This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4493

buildrpm: fix embarassing bug in shell variable expansions
ClosedPublic

Authored by durin42 on Sep 5 2018, 4:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc68cfc55af9d: buildrpm: fix embarassing bug in shell variable expansions
Summary

$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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 5 2018, 4:40 PM
yuja added a subscriber: yuja.Sep 6 2018, 8:18 AM

Queued for stable, thanks.

Closed by commit rHGc68cfc55af9d: buildrpm: fix embarassing bug in shell variable expansions (authored by durin42). · Explain WhySep 6 2018, 8:27 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/buildrpm (2 lines)

Diff 10813

contrib/packaging/buildrpm

if [ -z "$type" ] ; then if [ -z "$type" ] ; then
release=1 release=1
else else
release=0.9_$type release=0.9_$type
fi fi
if [ -n "$distance" ] ; then if [ -n "$distance" ] ; then
release=$release+$distance_$node release=$release+${distance}_${node}
fi fi
if [ "$PYTHONVER" ]; then if [ "$PYTHONVER" ]; then
release=$release+$PYTHONVER release=$release+$PYTHONVER
RPMPYTHONVER=$PYTHONVER RPMPYTHONVER=$PYTHONVER
else else
RPMPYTHONVER=%{nil} RPMPYTHONVER=%{nil}
fi fi