Changeset 1053 in MondoRescue

Timestamp:

Jan 14, 2007, 2:24:38 AM (18 years ago)

Author:

andree

Message:

Make functions restore_a_biggiefile_from_CD() and
restore_all_tarballs_from_CD() aware of gzip'ed archives. Fixes restore
failing because no archive files are found when -G is used.

Location:

branches

Files:

• 2.2.1/mondo/src/mondorestore/mondo-restore.c (modified) (2 diffs)
• stable/mondo/src/mondorestore/mondo-restore.c (modified) (2 diffs)

branches/2.2.1/mondo/src/mondorestore/mondo-restore.c

@@ -1536 +1536 @@
             !does_file_exist(slice_fname
                              (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "gz"))
             &&
             !does_file_exist(slice_fname
@@ -2572 +2575 @@
         sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
                 current_tarball_number);
+        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
+                current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
             sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1536 +1536 @@
             !does_file_exist(slice_fname
                              (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "gz"))
             &&
             !does_file_exist(slice_fname
@@ -2572 +2575 @@
         sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
                 current_tarball_number);
+        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
+                current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
             sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",