diff options
| -rw-r--r-- | gurpmi | 10 | ||||
| -rw-r--r-- | t/cfg.t | 8 |
2 files changed, 10 insertions, 8 deletions
@@ -11,12 +11,10 @@ BEGIN { #- set up a safe path and environment } use Gtk2; -use MDK::Common::Func qw(partition); - use gurpmi; #- globals -my ($srpms, $rpms); +my ($srpms, $rpms) = ([], []); my ($mainw, $mainbox); my @all_rpms = gurpmi::parse_command_line(); @@ -39,9 +37,13 @@ sub all_descriptions { join '', qx(rpm -qp --qf '%{name}-%{version}-%{release}: %{summary}\\n' @_); } +foreach (@all_rpms) { + warn "$_"; + /\.src\.rpm$/ ? push(@$srpms, $_) : push(@$rpms, $_); +} + #- Ask question: save or install ? #- change depending on the number of rpms, and on the presence of srpms -($srpms, $rpms) = partition { /\.src\.rpm$/ } @all_rpms; { my $msg = ( @$srpms > 0 @@ -1,7 +1,7 @@ #!/usr/bin/perl use Test::More 'no_plan'; -use MDK::Common; +use File::Slurp; BEGIN { use_ok 'urpm::cfg' } BEGIN { use_ok 'urpm::download' } @@ -49,7 +49,7 @@ $cfgtext =~ s/\bkey_ids\b/key-ids/g; $cfgtext =~ s/"123"/123/g; $cfgtext =~ s/'kernel'/kernel/g; -my $cfgtext2 = cat_($file.2); +my $cfgtext2 = read_file($file.2); $cfgtext2 =~ s/# generated.*\n//; is( $cfgtext, $cfgtext2, 'config is the same' ) or system qw( diff -u ), $file, $file.2; @@ -70,12 +70,12 @@ is( $p->{http_proxy}, 'http://yoyodyne:8080/', 'read media proxy' ); is( $p->{user}, 'rafael', 'proxy user' ); is( $p->{pwd}, 'richard', 'proxy password' ); ok( dump_proxy_config(), 'dump_proxy_config' ); -$cfgtext2 = cat_($proxyfile); +$cfgtext2 = read_file($proxyfile); $cfgtext2 =~ s/# generated.*\n//; is( $cfgtext, $cfgtext2, 'dumped correctly' ); set_proxy_config(http_proxy => ''); ok( dump_proxy_config(), 'dump_proxy_config erased' ); -$cfgtext2 = cat_($proxyfile); +$cfgtext2 = read_file($proxyfile); $cfgtext2 =~ s/# generated.*\n//; $cfgtext =~ s/^http_proxy.*\n//; is( $cfgtext, $cfgtext2, 'dumped correctly' ); |