From 58bceae74fff3d1d4ef61b3fedd000347d0b022e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Nov 2005 10:07:28 +0000
Subject: [PATCH] r3548@krups: intrigeri | 2005-11-14 20:47:49 +0100 Fix:
the "Cancel" buttons used to have a weird behaviour... at least
---
ChangeLog | 1 +
handlers/rdiff.helper | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 34a4b9c..5d38854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ version 0.9.2 -- unreleased
fixed missing makecd.helper in Makefile.am/.in
rdiff ninjahelper bugfixes:
used to expand '*' in default source directories
+ the "Cancel" buttons used to have a weird behaviour... at least
version 0.9.1 -- November 05 2005
rearranged source so that it is relocatable with autotools
diff --git a/handlers/rdiff.helper b/handlers/rdiff.helper
index 91d715e..f4f376a 100644
--- a/handlers/rdiff.helper
+++ b/handlers/rdiff.helper
@@ -11,7 +11,7 @@ do_rdiff_dest() {
formItem "dest_host" "$rdiff_host"
formItem "dest_user" "$rdiff_user"
formDisplay
- [ $? = 1 ] && return;
+ [ $? = 0 ] || return
IFS=$''
replyconverted=`echo $REPLY | tr '\n' :`
@@ -40,7 +40,7 @@ do_rdiff_src() {
formItem include
formItem include
formDisplay
- [ $? = 1 ] && return;
+ [ $? = 0 ] || return
unset rdiff_includes
rdiff_includes=($REPLY)
@@ -52,7 +52,7 @@ do_rdiff_src() {
formItem exclude
formItem exclude
formDisplay
- [ $? = 1 ] && return;
+ [ $? = 0 ] || return
unset rdiff_excludes
rdiff_excludes=($REPLY)
@@ -75,7 +75,7 @@ do_ssh_con() {
return
else
booleanBox "rdiff action wizard" "This step will create a ssh key for the local root user with no passphrase (if one does not already exist), and attempt to copy root's public ssh key to authorized_keys file of $rdiff_user@$rdiff_host. This will allow the local root to make unattended backups to $rdiff_user@$rdiff_host.\n\n\nAre you sure you want to continue?"
- [ $? = 1 ] && return
+ [ $? = 0 ] || return
fi
if [ ! -f /root/.ssh/id_dsa.pub -a ! -f /root/.ssh/id_rsa.pub ]; then
@@ -263,7 +263,7 @@ rdiff_main_menu() {
dest "$destitem" \
conn "$conitem" \
finish "finish and create config file"
- [ $? = 1 ] && return;
+ [ $? = 0 ] || return
result="$REPLY"
case "$result" in
--
GitLab