| 1 |
truedfx 08/06/26 21:04:16 |
| 2 |
|
| 3 |
Modified: ufed-0.40-noremove.patch |
| 4 |
Log: |
| 5 |
Don't remove -* from make.conf; reported in bug 229601 by Willie Wong |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-portage/ufed/files/ufed-0.40-noremove.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/ufed/files/ufed-0.40-noremove.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/ufed/files/ufed-0.40-noremove.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/ufed/files/ufed-0.40-noremove.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: ufed-0.40-noremove.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/ufed/files/ufed-0.40-noremove.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- ufed-0.40-noremove.patch 7 Jan 2008 20:53:28 -0000 1.1 |
| 22 |
+++ ufed-0.40-noremove.patch 26 Jun 2008 21:04:16 -0000 1.2 |
| 23 |
@@ -1,5 +1,14 @@ |
| 24 |
--- ufed-0.40/ufed.pl |
| 25 |
+++ ufed-0.40/ufed.pl |
| 26 |
+@@ -23,7 +23,7 @@ |
| 27 |
+ |
| 28 |
+ delete @use_descriptions{qw(bootstrap build)}; |
| 29 |
+ |
| 30 |
+-$Portage::all_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'}; |
| 31 |
++$Portage::make_conf_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'}; |
| 32 |
+ |
| 33 |
+ for(keys %Portage::all_flags) { |
| 34 |
+ @{$use_descriptions{$_}} = "(Unknown)" |
| 35 |
@@ -39,21 +39,13 @@ |
| 36 |
flags_dialog; |
| 37 |
|
| 38 |
@@ -39,10 +48,12 @@ |
| 39 |
print $fh exists $Portage::make_defaults_flags{$flag} ? $Portage::make_defaults_flags{$flag} ? '(+' :'(-' :'( ' ; |
| 40 |
print $fh exists $Portage::use_defaults_flags{$flag} ? $Portage::use_defaults_flags{$flag} ? '+' : '-' : ' ' ; |
| 41 |
print $fh exists $Portage::make_conf_flags{$flag} ? $Portage::make_conf_flags{$flag} ? '+)': '-)': ' )'; |
| 42 |
-@@ -100,7 +93,7 @@ |
| 43 |
+@@ -99,8 +92,8 @@ |
| 44 |
+ if(POSIX::WIFEXITED($?)) { |
| 45 |
my $rc = POSIX::WEXITSTATUS($?); |
| 46 |
if($rc==0) { |
| 47 |
- my @flags = do { local $/; split /\n/, <$fh> }; |
| 48 |
+- my @flags = do { local $/; split /\n/, <$fh> }; |
| 49 |
++ my @flags = grep { $_ ne '--*' } do { local $/; split /\n/, <$fh> }; |
| 50 |
- save_flags finalise sort @flags; |
| 51 |
+ save_flags finalise @flags; |
| 52 |
} elsif($rc==1) |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@l.g.o mailing list |
Archives