buildrpm: remove prompt for uncommitted changes - it was a bad idea
authorMads Kiilerich <madski@unity3d.com>
Thu, 15 May 2014 01:48:37 +0200
changeset 21640 4bfb721de6dd
parent 21639 57e0f053e529
child 21641 977e5bd6eb76
buildrpm: remove prompt for uncommitted changes - it was a bad idea We want a command that is useful in scripts, not an interactive command.
Makefile
contrib/buildrpm
--- a/Makefile	Thu May 15 01:48:37 2014 +0200
+++ b/Makefile	Thu May 15 01:48:37 2014 +0200
@@ -144,7 +144,7 @@
 
 fedora:
 	mkdir -p packages/fedora
-	echo y | contrib/buildrpm
+	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/fedora
 	cp rpmbuild/SRPMS/* packages/fedora
 	rm -rf rpmbuild
@@ -155,7 +155,7 @@
 
 centos6:
 	mkdir -p packages/centos6
-	echo y | contrib/buildrpm
+	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/centos6
 	cp rpmbuild/SRPMS/* packages/centos6
 
--- a/contrib/buildrpm	Thu May 15 01:48:37 2014 +0200
+++ b/contrib/buildrpm	Thu May 15 01:48:37 2014 +0200
@@ -20,14 +20,6 @@
     exit 1
 fi
 
-if $HG id -i | grep '+$' > /dev/null 2>&1; then
-    echo -n "Your local changes will NOT be in the RPM. Continue [y/n] ? "
-    read answer
-    if echo $answer | grep -iv '^y'; then
-        exit
-    fi
-fi
-
 # build local hg and use it
 python setup.py build_py -c -d .
 HG="$PWD/hg"