Control: tag -1 + patch

Hi,

Klaus Ethgen wrote:
> Package: btrfs-tools
> Version: 0.19+20130131-1
> Severity: important
> 
> The new fsck.btrfs do not ignore »-a« or handle it propperly as other
> fsck do. Do this version breaks package initscripts. When a system
> start, checkfs.sh will check all file systems but the check of btrfs
> fails as the tool has not the same usage than other.

I think the following packaging change caused this issue:

   * Dropping fsck.patch, not needed anymore.

Because this patch added code which made -a being accepted as option:

---snip---
Author: Sten Heinze <s...@gmx.de>
Description:
 Ignore all arguments starting with -a in btrfsck for the time being
 (Closes: #567681, #571300, #612809, #668832).

diff -Naurp btrfs-tools.orig/btrfsck.c btrfs-tools/btrfsck.c
--- btrfs-tools.orig/btrfsck.c  2012-06-13 15:24:54.790365642 +0200
+++ btrfs-tools/btrfsck.c       2012-06-13 15:54:55.954645699 +0200
@@ -3406,6 +3406,12 @@ static void print_usage(void)
        exit(1);
 }
 
+static void print_info(void)
+{
+       fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
+       exit(0);
+}
+
 static struct option long_options[] = {
        { "super", 1, NULL, 's' },
        { "repair", 0, NULL, 0 },
@@ -3430,7 +3436,7 @@ int main(int ac, char **av)
 
        while(1) {
                int c;
-               c = getopt_long(ac, av, "", long_options,
+               c = getopt_long(ac, av, "anry", long_options,
                                &option_index);
                if (c < 0)
                        break;
@@ -3443,6 +3449,12 @@ int main(int ac, char **av)
                                break;
                        case '?':
                                print_usage();
+                                break;
+                       case 'n':
+                       case 'a':
+                       case 'r':
+                       case 'y':
+                               print_info();
                }
                if (option_index == 1) {
                        printf("enabling repair mode\n");
---snap---

Readding this patch (or at least the relevant parts thereof) should
fix the issue.

                Regards, Axel
-- 
 ,''`.  |  Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE
  `-    |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to