* Commit for 2.1.0.

[BackupPC.git] / lib / BackupPC / CGI / Restore.pm

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index f00ce59..8079d91 100644 (file)
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.1.0beta0, released 20 Mar 2004.
+# Version 2.1.0, released 20 Jun 2004.

 #
 # See http://backuppc.sourceforge.net.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -87,9 +87,6 @@ EOF
     if ( $badFileCnt ) {
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
     if ( $badFileCnt ) {
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }

-    if ( @fileList == 1 ) {
-       $pathHdr =~ s/(.*)\/.*/$1/;
-    }

     $pathHdr = "/" if ( $pathHdr eq "" );
     if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
        #
     $pathHdr = "/" if ( $pathHdr eq "" );
     if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
        #


@@ -184,14 +181,15 @@ EOF
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #

-       $bpc->cmdSystemOrEval(["$BinDir/BackupPC_tarCreate",
+       $bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_tarCreate",

                 "-h", $host,
                 "-n", $num,
                 "-s", $share,
                 @pathOpts,
                 @fileList
            ],
                 "-h", $host,
                 "-n", $num,
                 "-s", $share,
                 @pathOpts,
                 @fileList
            ],

-           sub { print(@_); }
+           sub { print(@_); },
+           1,                  # ignore stderr

        );
     } elsif ( $In{type} == 2 ) {
         #
        );
     } elsif ( $In{type} == 2 ) {
         #


@@ -221,7 +219,7 @@ EOF
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #

-       $bpc->cmdSystemOrEval(["$BinDir/BackupPC_zipCreate",
+       $bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_zipCreate",

                 "-h", $host,
                 "-n", $num,
                 "-c", $In{compressLevel},
                 "-h", $host,
                 "-n", $num,
                 "-c", $In{compressLevel},


@@ -229,7 +227,8 @@ EOF
                 @pathOpts,
                 @fileList
            ],
                 @pathOpts,
                 @fileList
            ],

-           sub { print(@_); }
+           sub { print(@_); },
+           1,                  # ignore stderr

        );
     } elsif ( $In{type} == 3 ) {
         #
        );
     } elsif ( $In{type} == 3 ) {
         #