[PATCH 03 of 22] buildrpm: remove prompt for uncommitted changes - it was a bad idea
Mads Kiilerich
mads at kiilerich.com
Tue May 20 02:09:58 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1400111317 -7200
# Thu May 15 01:48:37 2014 +0200
# Node ID c5aad482861c9e9d1ac219eac180ccaac0d6124f
# Parent b00a1b8aec5c5891bbc23b5968887494cdf637c6
buildrpm: remove prompt for uncommitted changes - it was a bad idea
We want a command that is useful in scripts, not an interactive command.
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n
fedora:
mkdir -p build/fedora
- echo y | contrib/buildrpm
+ contrib/buildrpm
cp rpmbuild/RPMS/*/* build/fedora
cp rpmbuild/SRPMS/* build/fedora
rm -rf rpmbuild
@@ -147,7 +147,7 @@ docker-fedora:
centos6:
mkdir -p build/centos6
- echo y | contrib/buildrpm
+ contrib/buildrpm
cp rpmbuild/RPMS/*/* build/centos6
cp rpmbuild/SRPMS/* build/centos6
diff --git a/contrib/buildrpm b/contrib/buildrpm
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -20,14 +20,6 @@ if [ ! -d .hg ]; then
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"
More information about the Mercurial-devel
mailing list