[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.4-8-g5edfa94
Modestas Vainius
modax at alioth.debian.org
Sun May 27 12:42:45 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=0f60987
The following commit has been merged in the master branch:
commit 0f609870d7661c5dbc6fa45e52397592c04ce84e
Author: Modestas Vainius <modax at debian.org>
Date: Sun May 27 15:17:14 2012 +0300
The first "Y" to pkgkde-vcs confirms all subsequent commands.
Added "p" answer in order to allow the user to choose confirming command by
command.
---
man1/pkgkde-vcs.1 | 4 ++--
pkgkde-vcs | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/man1/pkgkde-vcs.1 b/man1/pkgkde-vcs.1
index da86c89..abb9862 100644
--- a/man1/pkgkde-vcs.1
+++ b/man1/pkgkde-vcs.1
@@ -49,9 +49,9 @@ At the moment, Bpkgkde\-vcsR supports only IGitR VCS.
.SS Common options
.TP
.B \-y
-By default, execution of each external command that makes changes to the
+By default, execution of the first external command that makes changes to the
repository has to be explicitly confirmed by user. However, if this option is
-specified, command will be run without confirmation.
+specified, the first command will be run without confirmation.
.TP
.B \-n
Do not run any external commands that make changes to the repository. Useful
diff --git a/pkgkde-vcs b/pkgkde-vcs
index 6c4c207..cd7d811 100755
--- a/pkgkde-vcs
+++ b/pkgkde-vcs
@@ -84,11 +84,14 @@ runcmd()
echo "$" "$*" >&2
fi
if [ "$OPT_PROMPT" = "prompt" ]; then
- echo -n "Run the command above? [Y/n]: "
+ echo -n "Run this command above and all others? (p = prompt next time) [Y/n/p]: "
while true; do
read ans
if [ "$ans" = "Y" ] || [ "$ans" = "y" ] || [ -z "$ans" ]; then
+ OPT_PROMPT="y"
break
+ elif [ "$ans" = "p" ] || [ "$ans" = "P" ]; then
+ break;
elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
info "Cancelled by user." >&2
exit 2
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list