added local support to rdiff helper

diff --git a/ChangeLog b/ChangeLog
index 72c5923d75258dbb5b70200a361c9676847f3c1c..5baf38370301477c16868dc98f49204576beb6f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@ version 0.9.5 -- unreleased
         . Handle "keep = yes" to disable old backups removal (Closes: #424633)
         . Add configuration option to allow you to disable the version check
           as in some instances this may be an ok scenario (Closes: #424632)
         . Handle "keep = yes" to disable old backups removal (Closes: #424633)
         . Add configuration option to allow you to disable the version check
           as in some instances this may be an ok scenario (Closes: #424632)

+        . Added local destination support to helper (Closes: Trac#4)

        rub/rsync
         . Fixed typo in rub handler that caused it to not work
         . Changed to use lib/vserver code
        rub/rsync
         . Fixed typo in rub handler that caused it to not work
         . Changed to use lib/vserver code

diff --git a/handlers/rdiff.helper.in b/handlers/rdiff.helper.in
index 42bcb1b2de04c3809b55164eabdc0fad031b2cf0..1055280b155850bf905a89bc987567fc32ca1a20 100644 (file)
--- a/handlers/rdiff.helper.in
+++ b/handlers/rdiff.helper.in
@@ -112,6 +112,7 @@ do_rdiff_dest() {
         formItem "dest_directory" "$rdiff_directory"
         formItem "dest_host" "$rdiff_host"
         formItem "dest_user" "$rdiff_user"
         formItem "dest_directory" "$rdiff_directory"
         formItem "dest_host" "$rdiff_host"
         formItem "dest_user" "$rdiff_user"

+        formItem "dest_type" "$rdiff_type"

         formDisplay
      [ $? = 0 ] || return
      tmp_array=($REPLY)
         formDisplay
      [ $? = 0 ] || return
      tmp_array=($REPLY)


@@ -119,6 +120,7 @@ do_rdiff_dest() {
      rdiff_directory=${tmp_array[1]}
      rdiff_host=${tmp_array[2]}
      rdiff_user=${tmp_array[3]}  
      rdiff_directory=${tmp_array[1]}
      rdiff_host=${tmp_array[2]}
      rdiff_user=${tmp_array[3]}  

+     rdiff_type=${tmp_array[4]}

   done
   set +o noglob
   
   done
   set +o noglob
   


@@ -133,6 +135,9 @@ do_rdiff_ssh_con() {
    if [ "$_dest_done" = "" ]; then
       msgBox "$rdiff_title: error" "You must first configure the destination."
       return
    if [ "$_dest_done" = "" ]; then
       msgBox "$rdiff_title: error" "You must first configure the destination."
       return

+   elif [ "$rdiff_type" = "" ]; then
+      msgBox "$rdiff_title: error" "You must first configure the destination backup type."
+      return

    elif [ "$rdiff_user" = "" ]; then
       msgBox "$rdiff_title: error" "You must first configure the destination user."
       return
    elif [ "$rdiff_user" = "" ]; then
       msgBox "$rdiff_title: error" "You must first configure the destination user."
       return


@@ -386,6 +391,7 @@ rdiff_wizard() {
    _adv_done=
    rdiff_keep=60D
    rdiff_directory=/backup/`hostname`
    _adv_done=
    rdiff_keep=60D
    rdiff_directory=/backup/`hostname`

+   rdiff_type=remote

    rdiff_user=
    rdiff_host=
 
    rdiff_user=
    rdiff_host=