Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 324412 Details for
Bug 434672
app-portage/ufed should look for make.* in new location: /etc/portage
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to make ufed use the findings on the proper make.conf or error out if none is found
ufed-0.40.1-add_new_path_to_ufed.patch (text/plain), 1.74 KB, created by
Sven Eden
on 2012-09-20 17:42:03 UTC
(
hide
)
Description:
Patch to make ufed use the findings on the proper make.conf or error out if none is found
Filename:
MIME Type:
Creator:
Sven Eden
Created:
2012-09-20 17:42:03 UTC
Size:
1.74 KB
patch
obsolete
>--- ufed-0.40.1/ufed.pl.in 2009-10-27 00:09:56.000000000 +0100 >+++ src/ufed.pl.in 2012-09-20 19:17:28.836135032 +0200 >@@ -17,6 +17,11 @@ > sub read_use_descs(); > sub save_flags(@); > >+# Quit early if there is no valid make.conf found by Portage.pm >+die "Could not determine the location of your make.conf.\n" >+ unless (defined($Portage::make_conf_path) >+ && length($Portage::make_conf_path)); >+ > delete $Portage::all_flags{'*'}; > > read_use_descs; >@@ -25,6 +30,7 @@ > > $Portage::make_conf_flags{'-*'} = 1 if defined $Portage::make_conf_flags{'*'} && !$Portage::make_conf_flags{'*'}; > >+ > for(keys %Portage::all_flags) { > @{$use_descriptions{$_}} = "(Unknown)" > if not exists $use_descriptions{$_}; >@@ -155,10 +161,11 @@ > > my (@flags) = @_; > my $contents; >+ my $mcFile = $Portage::make_conf_path; > > { >- open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; >- open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n"; >+ open my $makeconf, '<', $mcFile or die "Couldn't open $mcFile\nReason: $!\n"; >+ open my $makeconfold, '>', "${mcFile}.old" or die "Couldn't open ${mcFile}.old\nReason: $!\n"; > local $/; > $_ = <$makeconf>; > print $makeconfold $_; >@@ -293,11 +300,11 @@ > die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@; > > print STDERR <<EOF if $sourcing; >-Warning: source command found in /etc/make.conf. Flags may >+Warning: source command found in ${mcFile}. Flags may > be saved incorrectly if the sourced file modifies them. > EOF > { >- open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; >+ open my $makeconf, '>', $mcFile or die "Couldn't open $mcFile\nReason: $!\n"; > print $makeconf $_; > close $makeconf; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 434672
:
324238
|
324240
|
324410
| 324412 |
324422
|
324424
|
324748
|
325674
|
326628
|
326630
|
326632