summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-26 07:16:13 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-26 07:16:13 +0000
commit7a90ca0549c7d67b4868b29103c65a4acc3aac4b (patch)
treee7277df8db691d007f508c6700360573f6892461 /sys-fs/reiser4progs
parentupdate URLs #224755 (diff)
downloadgentoo-2-7a90ca0549c7d67b4868b29103c65a4acc3aac4b.tar.gz
gentoo-2-7a90ca0549c7d67b4868b29103c65a4acc3aac4b.tar.bz2
gentoo-2-7a90ca0549c7d67b4868b29103c65a4acc3aac4b.zip
Fix by Anders Aagaard for -p (preen) operation #237393.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'sys-fs/reiser4progs')
-rw-r--r--sys-fs/reiser4progs/ChangeLog9
-rw-r--r--sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch17
-rw-r--r--sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild (renamed from sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild)2
3 files changed, 17 insertions, 11 deletions
diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index 52211bed1d13..d81a5a64ef59 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/reiser4progs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.34 2008/05/31 17:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.35 2008/10/26 07:16:13 vapier Exp $
+
+*reiser4progs-1.0.6-r2 (26 Oct 2008)
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+ files/reiser4progs-1.0.6-preen.patch, -reiser4progs-1.0.6-r1.ebuild,
+ +reiser4progs-1.0.6-r2.ebuild:
+ Fix by Anders Aagaard for -p (preen) operation #237393.
*reiser4progs-1.0.6-r1 (31 May 2008)
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
index d6b8374108a9..c48eb0d54169 100644
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
@@ -1,4 +1,4 @@
-make -p mean "preen" like all other checkers
+Alias -p "preen" to -a "auto".
http://bugs.gentoo.org/195988
@@ -50,17 +50,16 @@ http://bugs.gentoo.org/195988
{"cache", required_argument, 0, 'c'},
{"override", required_argument, NULL, 'o'},
/* Fsck hidden options. */
-@@ -203,6 +205,9 @@
- case 'q':
- aux_gauge_set_handler(NULL, GT_PROGRESS);
+@@ -190,6 +192,8 @@
+ case 'f':
+ aal_set_bit(&data->options, FSCK_OPT_FORCE);
break;
+ case 'p':
-+ /* Fall through as preen should fix errors */
-+ mode = RM_FIX;
- case 'y':
- aal_set_bit(&data->options, FSCK_OPT_YES);
++ /* Fall through to auto, as preen is an alias for -a */
+ case 'a':
+ aal_set_bit(&data->options, FSCK_OPT_AUTO);
break;
-@@ -226,9 +231,6 @@
+@@ -226,9 +230,6 @@
case 'l':
mode = RM_SHOW_PLUG;
break;
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild
index b35c9cfd97fa..87fa534a09fe 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild,v 1.2 2008/10/26 06:54:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild,v 1.1 2008/10/26 07:16:13 vapier Exp $
inherit toolchain-funcs autotools