diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-12 12:15:01 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-12 12:15:01 +0000 |
| commit | 98fe1b85f7c0a613343e0def29cc531f7e4d68dd (patch) | |
| tree | a661e1383343358b23f4067a03a4e4bc6badc623 /urpm | |
| parent | 12eb101d85191fda6654d4ed804f01df78fa6e52 (diff) | |
| download | urpmi-98fe1b85f7c0a613343e0def29cc531f7e4d68dd.tar urpmi-98fe1b85f7c0a613343e0def29cc531f7e4d68dd.tar.gz urpmi-98fe1b85f7c0a613343e0def29cc531f7e4d68dd.tar.bz2 urpmi-98fe1b85f7c0a613343e0def29cc531f7e4d68dd.tar.xz urpmi-98fe1b85f7c0a613343e0def29cc531f7e4d68dd.zip | |
- library
o urpm::select: new function get_preferred() replacing sort_choices()
(for drakx)
o get rid of "use of unitialized" when file is unset (for drakx)
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/select.pm | 4 | ||||
| -rw-r--r-- | urpm/sys.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/urpm/select.pm b/urpm/select.pm index 978f88bb..cc96d9d5 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -262,7 +262,7 @@ sub cooked_prefer { @{$urpm->{prefer_regexps}}; } -sub sort_choices { +sub get_preferred { my ($urpm, $choices, $cmdline_prefer) = @_; my @prefer; @@ -278,7 +278,7 @@ sub sort_choices { $urpm->{log}("preferring $prefer_s over $other_s"); } } - (@prefer, @l); + (\@prefer, \@l); } #- find packages to remove. diff --git a/urpm/sys.pm b/urpm/sys.pm index 612c9ed6..da7736d9 100644 --- a/urpm/sys.pm +++ b/urpm/sys.pm @@ -16,7 +16,7 @@ use POSIX (); sub get_packages_list { my ($file, $o_extra) = @_; my @l = split(/,/, $o_extra || ''); - if (open(my $f, '<', $file)) { + if ($file && open(my $f, '<', $file)) { push @l, <$f>; } [ grep { $_ } map { |