merge with stable
authorAugie Fackler <augie@google.com>
Fri, 07 Sep 2018 11:35:43 -0400
changeset 39467 164abbe9d8ee
parent 39466 83dd656586b1 (current diff)
parent 39455 6af7765bdb7c (diff)
child 39468 6772cf74ff6f
merge with stable
--- a/contrib/packaging/buildrpm	Tue Sep 04 15:16:22 2018 +0300
+++ b/contrib/packaging/buildrpm	Fri Sep 07 11:35:43 2018 -0400
@@ -50,8 +50,6 @@
 
 gethgversion
 
-# TODO: handle distance/node set, and type set
-
 if [ -z "$type" ] ; then
    release=1
 else
@@ -59,7 +57,7 @@
 fi
 
 if [ -n "$distance" ] ; then
-    release=$release+$distance_$node
+    release=$release+${distance}_${node}
 fi
 
 if [ "$PYTHONVER" ]; then