summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-10-13 21:54:18 +0000
committerOlivier Blin <blino@mageia.org>2012-10-13 21:54:18 +0000
commit062c48f65a0c160d68ab9d28d4d8f84c27597ce6 (patch)
tree7002d92e6e0a8ac250fb683196fd9498e4ed967e
parent70013f62f79353910e5d1358eabb045a1b375bff (diff)
downloaddrakx-062c48f65a0c160d68ab9d28d4d8f84c27597ce6.tar
drakx-062c48f65a0c160d68ab9d28d4d8f84c27597ce6.tar.gz
drakx-062c48f65a0c160d68ab9d28d4d8f84c27597ce6.tar.bz2
drakx-062c48f65a0c160d68ab9d28d4d8f84c27597ce6.tar.xz
drakx-062c48f65a0c160d68ab9d28d4d8f84c27597ce6.zip
revert bogus commit
-rw-r--r--perl-install/pkgs.pm6
-rwxr-xr-xperl-install/standalone/remove-unused-packages2
2 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 58f14b161..ce22d1a58 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -168,9 +168,7 @@ sub simple_read_rpmsrate {
sub detect_rpmsrate_hardware_packages {
my ($o_match_all_hardware, $ignore_flags) = @_;
- my @l = grep { !/openoffice|java/ } simple_read_rpmsrate($o_match_all_hardware, $ignore_flags);
- use Data::Dumper;
- print Dumper([ sort(@l) ]);
+ grep { !/openoffice|java/ } simple_read_rpmsrate($o_match_all_hardware, $ignore_flags);
}
sub detect_graphical_drivers {
@@ -187,7 +185,7 @@ sub detect_graphical_drivers {
}
my @drivers = grep { $_ } uniq(map { $_->{Driver2} } @cards);
- map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs), if_($card->{FIRMWARE}, $card->{FIRMWARE}) } @drivers;
+ map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs) } @drivers;
}
sub detect_network_drivers {
diff --git a/perl-install/standalone/remove-unused-packages b/perl-install/standalone/remove-unused-packages
index 4eb60c2e9..bc54c3e1c 100755
--- a/perl-install/standalone/remove-unused-packages
+++ b/perl-install/standalone/remove-unused-packages
@@ -6,6 +6,6 @@ use interactive;
use do_pkgs;
use standalone;
-my $in = interactive->vnew();#'su');
+my $in = interactive->vnew('su');
my $do_pkgs = do_pkgs::do_pkgs($in);
pkgs::remove_unused_packages($in, $do_pkgs);