# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1536334543 14400
# Node ID 164abbe9d8ee6aff41b4ec0e3e27a50a4125e543
# Parent  83dd656586b14a06b1b7e0fa57ab2a801eab3da5# Parent  6af7765bdb7c88da8393cdddbe836989852b5a5f
merge with stable

diff -r 83dd656586b1 -r 164abbe9d8ee contrib/packaging/buildrpm
--- 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