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 4bfb721de6ddecdef5c30a257e2f4e4d90019f2b
parent 21639 57e0f053e52967babd40531b6b91deeeb30a7380
child 21641 977e5bd6eb76b74c015c562b56923e4bc6ad087d
push id1
push usergszorc@mozilla.com
push dateWed, 18 Mar 2015 16:34:57 +0000
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
+++ b/Makefile
@@ -139,28 +139,28 @@ osx:
 	   (echo "Missing bdist_mpkg (easy_install bdist_mpkg)"; false)
 	bdist_mpkg setup.py
 	mkdir -p packages/osx
 	rm -rf dist/mercurial-*.mpkg
 	mv dist/mercurial*macosx*.zip packages/osx
 
 fedora:
 	mkdir -p packages/fedora
-	echo y | contrib/buildrpm
+	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/fedora
 	cp rpmbuild/SRPMS/* packages/fedora
 	rm -rf rpmbuild
 
 docker-fedora:
 	mkdir -p packages/fedora
 	contrib/dockerrpm fedora
 
 centos6:
 	mkdir -p packages/centos6
-	echo y | contrib/buildrpm
+	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/centos6
 	cp rpmbuild/SRPMS/* packages/centos6
 
 docker-centos6:
 	mkdir -p packages/centos6
 	contrib/dockerrpm centos6
 
 .PHONY: help all local build doc clean install install-bin install-doc \
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -15,24 +15,16 @@ if [ ! -f $specfile ]; then
     exit 1
 fi
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     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"
 PYTHONPATH="$PWD/mercurial/pure"
 export PYTHONPATH
 
 rpmdir="$PWD/rpmbuild"