From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6650C1387C2 for ; Fri, 1 Feb 2013 10:50:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 270A621C051; Fri, 1 Feb 2013 10:49:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A496121C051 for ; Fri, 1 Feb 2013 10:49:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8236833DCC5 for ; Fri, 1 Feb 2013 10:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AFFEAE408E for ; Fri, 1 Feb 2013 10:49:50 +0000 (UTC) From: "Sven Eden" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" Message-ID: <1359715842.900c8baab6a5cdd2e9556baeaa166be920537268.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: ufed.pl.in X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: 900c8baab6a5cdd2e9556baeaa166be920537268 X-VCS-Branch: master Date: Fri, 1 Feb 2013 10:49:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3fdeb7e-1c75-4b2c-991f-866aab31ad3c X-Archives-Hash: aefdaf2cdc7328f6844c7832f5b9f5d0 commit: 900c8baab6a5cdd2e9556baeaa166be920537268 Author: Sven Eden gmx de> AuthorDate: Fri Feb 1 10:50:42 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Fri Feb 1 10:50:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=900c8baa Removed old parts that where commented out. --- ufed.pl.in | 47 +++-------------------------------------------- 1 files changed, 3 insertions(+), 44 deletions(-) diff --git a/ufed.pl.in b/ufed.pl.in index bf09de4..d31b1b1 100644 --- a/ufed.pl.in +++ b/ufed.pl.in @@ -13,7 +13,7 @@ my $version = 'XX_PACKAGE_VERSION@'; my $interface = 'ufed-curses'; #my $memcheck = "/usr/bin/valgrind -v --trace-children=yes --tool=memcheck" -# . " --track-origins=yes --leak-check=full --show-reachable=yes" +# . " --track-origins=yes --leak-check=full --show-reachable=no" # . " --read-var-info=yes" # . " XX_libexecdir@/ufed-curses 2>/tmp/ufed_memcheck.log"; @@ -72,20 +72,6 @@ sub flags_dialog { # Write out flags for my $flag (sort { uc $a cmp uc $b } keys %$Portage::use_flags) { my $conf = $Portage::use_flags->{$flag}; ## Shortcut -# deprecated: The output is updated to match the new data structure. -# my $state = "g"; -# -# $outTxt .= sprintf ("%s %s (%s%s) %d\n", $flag, -# defined($conf->{global}{conf}) ? -# $conf->{global}{conf} > 0 ? 'on' : -# $conf->{global}{conf} < 0 ? 'off' : 'def' : 'def', -# defined($conf->{global}{"default"}) ? -# $conf->{global}{"default"} > 0 ? '+' : -# $conf->{global}{"default"} < 0 ? '-' : ' ' : ' ', -# defined($conf->{global}{conf}) ? -# $conf->{global}{conf} > 0 ? '+' : -# $conf->{global}{conf} < 0 ? '-' : ' ' : ' ', -# $conf->{count}); $outTxt .= sprintf ("%s [%s%s] %d\n", $flag, defined($conf->{global}{conf}) ? @@ -96,29 +82,14 @@ sub flags_dialog { $conf->{global}{"default"} < 0 ? '-' : ' ' : ' ', $conf->{count}); -# # Print global description first (if available) + # Print global description first (if available) if (defined($conf->{global}) && length($conf->{global}{descr})) { -# deprecated: The output is updated to match the new data structure. -# if ($conf->{global}{installed}) { -# $conf->{global}{masked} and $state = "M"; -# $conf->{global}{masked} or $state = "G"; -# } else { -# $conf->{global}{masked} and $state = "m"; -# } -# $outTxt .= "[" . $conf->{global}{descr} . "] $state\n"; -# * @param[in] state '+','-',' ' for global, installed, forced, masked, package - in that order. $outTxt .= sprintf("\t%s\t ( ) [+%s%s%s ]\n", $conf->{global}{descr}, $conf->{global}{installed} ? '+' : ' ', $conf->{global}{forced} ? '+' : ' ', $conf->{global}{masked} ? '+' : ' '); - -# deprecated: The output is updated to match the new data structure. -# # Then print the list of affected packages that have no own entry -# for my $afLst (@{$conf->{global}{affected}}) { -# (defined($afLst) && length($afLst)) -# and $outTxt .= "($afLst) [Affected by global flag setting] $state\n"; -# } + for my $afLst (@{$conf->{global}{affected}}) { (defined($afLst) && length($afLst)) and $outTxt .= sprintf("\t%s\t (%s) [+ ]\n", @@ -129,18 +100,6 @@ sub flags_dialog { # Finally print the local description lines for my $pkg (sort keys %{$conf->{"local"}}) { -# deprecated: The output is updated to match the new data structure. -# $state = "l"; -# if ($conf->{"local"}{$pkg}{installed}) { -# $state = "L"; -# if ($conf->{global}{masked}) { -# $conf->{"local"}{$pkg}{masked} > -1 and $state = "M"; -# $conf->{"local"}{$pkg}{masked} < 0 and $state = "L"; -# } -# } elsif ($conf->{global}{masked}) { -# $conf->{"local"}{$pkg}{masked} > -1 and $state = "m"; -# } -# $outTxt .= sprintf("(%s) [%s] %s\n", $pkg, $conf->{"local"}{$pkg}{descr}, $state); $outTxt .= sprintf("\t%s\t (%s) [ %s%s%s%s]\n", $conf->{"local"}{$pkg}{descr}, $pkg,