| 1 |
commit: 900c8baab6a5cdd2e9556baeaa166be920537268 |
| 2 |
Author: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Fri Feb 1 10:50:42 2013 +0000 |
| 4 |
Commit: Sven Eden <sven.eden <AT> gmx <DOT> de> |
| 5 |
CommitDate: Fri Feb 1 10:50:42 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=900c8baa |
| 7 |
|
| 8 |
Removed old parts that where commented out. |
| 9 |
|
| 10 |
--- |
| 11 |
ufed.pl.in | 47 +++-------------------------------------------- |
| 12 |
1 files changed, 3 insertions(+), 44 deletions(-) |
| 13 |
|
| 14 |
diff --git a/ufed.pl.in b/ufed.pl.in |
| 15 |
index bf09de4..d31b1b1 100644 |
| 16 |
--- a/ufed.pl.in |
| 17 |
+++ b/ufed.pl.in |
| 18 |
@@ -13,7 +13,7 @@ my $version = 'XX_PACKAGE_VERSION@'; |
| 19 |
|
| 20 |
my $interface = 'ufed-curses'; |
| 21 |
#my $memcheck = "/usr/bin/valgrind -v --trace-children=yes --tool=memcheck" |
| 22 |
-# . " --track-origins=yes --leak-check=full --show-reachable=yes" |
| 23 |
+# . " --track-origins=yes --leak-check=full --show-reachable=no" |
| 24 |
# . " --read-var-info=yes" |
| 25 |
# . " XX_libexecdir@/ufed-curses 2>/tmp/ufed_memcheck.log"; |
| 26 |
|
| 27 |
@@ -72,20 +72,6 @@ sub flags_dialog { |
| 28 |
# Write out flags |
| 29 |
for my $flag (sort { uc $a cmp uc $b } keys %$Portage::use_flags) { |
| 30 |
my $conf = $Portage::use_flags->{$flag}; ## Shortcut |
| 31 |
-# deprecated: The output is updated to match the new data structure. |
| 32 |
-# my $state = "g"; |
| 33 |
-# |
| 34 |
-# $outTxt .= sprintf ("%s %s (%s%s) %d\n", $flag, |
| 35 |
-# defined($conf->{global}{conf}) ? |
| 36 |
-# $conf->{global}{conf} > 0 ? 'on' : |
| 37 |
-# $conf->{global}{conf} < 0 ? 'off' : 'def' : 'def', |
| 38 |
-# defined($conf->{global}{"default"}) ? |
| 39 |
-# $conf->{global}{"default"} > 0 ? '+' : |
| 40 |
-# $conf->{global}{"default"} < 0 ? '-' : ' ' : ' ', |
| 41 |
-# defined($conf->{global}{conf}) ? |
| 42 |
-# $conf->{global}{conf} > 0 ? '+' : |
| 43 |
-# $conf->{global}{conf} < 0 ? '-' : ' ' : ' ', |
| 44 |
-# $conf->{count}); |
| 45 |
|
| 46 |
$outTxt .= sprintf ("%s [%s%s] %d\n", $flag, |
| 47 |
defined($conf->{global}{conf}) ? |
| 48 |
@@ -96,29 +82,14 @@ sub flags_dialog { |
| 49 |
$conf->{global}{"default"} < 0 ? '-' : ' ' : ' ', |
| 50 |
$conf->{count}); |
| 51 |
|
| 52 |
-# # Print global description first (if available) |
| 53 |
+ # Print global description first (if available) |
| 54 |
if (defined($conf->{global}) && length($conf->{global}{descr})) { |
| 55 |
-# deprecated: The output is updated to match the new data structure. |
| 56 |
-# if ($conf->{global}{installed}) { |
| 57 |
-# $conf->{global}{masked} and $state = "M"; |
| 58 |
-# $conf->{global}{masked} or $state = "G"; |
| 59 |
-# } else { |
| 60 |
-# $conf->{global}{masked} and $state = "m"; |
| 61 |
-# } |
| 62 |
-# $outTxt .= "[" . $conf->{global}{descr} . "] $state\n"; |
| 63 |
-# * @param[in] state '+','-',' ' for global, installed, forced, masked, package - in that order. |
| 64 |
$outTxt .= sprintf("\t%s\t ( ) [+%s%s%s ]\n", |
| 65 |
$conf->{global}{descr}, |
| 66 |
$conf->{global}{installed} ? '+' : ' ', |
| 67 |
$conf->{global}{forced} ? '+' : ' ', |
| 68 |
$conf->{global}{masked} ? '+' : ' '); |
| 69 |
- |
| 70 |
-# deprecated: The output is updated to match the new data structure. |
| 71 |
-# # Then print the list of affected packages that have no own entry |
| 72 |
-# for my $afLst (@{$conf->{global}{affected}}) { |
| 73 |
-# (defined($afLst) && length($afLst)) |
| 74 |
-# and $outTxt .= "($afLst) [Affected by global flag setting] $state\n"; |
| 75 |
-# } |
| 76 |
+ |
| 77 |
for my $afLst (@{$conf->{global}{affected}}) { |
| 78 |
(defined($afLst) && length($afLst)) |
| 79 |
and $outTxt .= sprintf("\t%s\t (%s) [+ ]\n", |
| 80 |
@@ -129,18 +100,6 @@ sub flags_dialog { |
| 81 |
|
| 82 |
# Finally print the local description lines |
| 83 |
for my $pkg (sort keys %{$conf->{"local"}}) { |
| 84 |
-# deprecated: The output is updated to match the new data structure. |
| 85 |
-# $state = "l"; |
| 86 |
-# if ($conf->{"local"}{$pkg}{installed}) { |
| 87 |
-# $state = "L"; |
| 88 |
-# if ($conf->{global}{masked}) { |
| 89 |
-# $conf->{"local"}{$pkg}{masked} > -1 and $state = "M"; |
| 90 |
-# $conf->{"local"}{$pkg}{masked} < 0 and $state = "L"; |
| 91 |
-# } |
| 92 |
-# } elsif ($conf->{global}{masked}) { |
| 93 |
-# $conf->{"local"}{$pkg}{masked} > -1 and $state = "m"; |
| 94 |
-# } |
| 95 |
-# $outTxt .= sprintf("(%s) [%s] %s\n", $pkg, $conf->{"local"}{$pkg}{descr}, $state); |
| 96 |
$outTxt .= sprintf("\t%s\t (%s) [ %s%s%s%s]\n", |
| 97 |
$conf->{"local"}{$pkg}{descr}, |
| 98 |
$pkg, |
Archives