[Forensics-changes] [SCM] debian-forensics/extundelete branch, debian, updated. debian/0.2.0-1-13-g09cf0c7

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit 09cf0c736a8e88880d823a12890618bc9d5f8ae0
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Thu Dec 13 08:07:32 2012 +0100

    Removing broken output_dir patch.

diff --git a/debian/patches/01_output_dir.patch b/debian/patches/01_output_dir.patch
deleted file mode 100644
index 1015f71..0000000
--- a/debian/patches/01_output_dir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: create an additional option: --output-dir
- This allows restore files in a output specific directory
- instead  default directory ./RESTORE_FILES
-Forwarded: yes
-Author: Elías Alejandro Año Mendoza <ealmdz at gmail.com>
-Last-Update: 2012-12-13
-
-===================================================================
---- a/src/cli.cc
-+++ b/src/cli.cc
-@@ -120,6 +120,8 @@
-   os << "  --restore-files 'path' Will restore files which are listed in the file 'path'.\n";
-   os << "                         Each filename should be in the same format as an option\n";
-   os << "                         to --restore-file, and there should be one per line.\n";
-+  os << "  --output-dir 'path'    Restore files in the output dir 'path'.\n";
-+  os << "                         By default the restored files are created under current directory 'RECOVERED_FILES'.\n";
-   os << "  --restore-all          Attempts to restore everything.\n";
-   os << "  -j journal             Reads an external journal from the named file.\n";
-   os << "  -b blocknumber         Uses the backup superblock at blocknumber when opening\n";
-@@ -422,6 +424,7 @@
- 		opt_show_journal_inodes,
- 		opt_restore_file,
- 		opt_restore_files,
-+		opt_output_dir,
- 		opt_restore_directory,
- 		opt_restore_inode,
- 		opt_restore_all,
-@@ -445,6 +448,7 @@
- 		{"restore-inode", 1, &long_option, opt_restore_inode},
- 		{"restore-file", 1, &long_option, opt_restore_file},
- 		{"restore-files", 1, &long_option, opt_restore_files},
-+		{"output-dir", 1, &long_option, opt_output_dir},
- 		{"restore-directory", 1, &long_option, opt_restore_directory},
- 		{"restore-all", 0, &long_option, opt_restore_all},
- 		{"log", 1, &long_option, opt_log},
-@@ -497,6 +501,21 @@
- 			case opt_restore_files:
- 				commandline_restore_files = optarg;
- 				break;
-+			case opt_output_dir:
-+				{
-+				std::string optarg1 = optarg;
-+				int subcad = optarg1.find_last_of("/");
-+				std::string res = optarg1.substr(subcad+1);
-+					if(res!="")
-+						{
-+						outputdir = optarg1 + "/RECOVERED_FILES/";
-+						}
-+					else
-+						{
-+						outputdir = optarg1 + "RECOVERED_FILES/";
-+						}
-+				}
-+				break;
- 			case opt_restore_directory:
- 				commandline_restore_directory = optarg;
- 				break;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8388ca0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_output_dir.patch

-- 
debian-forensics/extundelete