From c5399523daa90db86e0dd1220d5480e7baf1cfd3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 11 Aug 2007 15:32:55 +0000
Subject: move get_packages_list() (for next commit)

---
 urpm/media.pm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'urpm/media.pm')

diff --git a/urpm/media.pm b/urpm/media.pm
index db99910f..d0cbb3b7 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -613,7 +613,7 @@ sub _compute_flags_for_skiplist {
     my ($urpm, $cmdline_skiplist) = @_;
     my %uniq;
     $urpm->compute_flags(
-	get_packages_list($urpm->{skiplist}, $cmdline_skiplist),
+	urpm::sys::get_packages_list($urpm->{skiplist}, $cmdline_skiplist),
 	skip => 1,
 	callback => sub {
 	    my ($urpm, $pkg) = @_;
@@ -629,7 +629,7 @@ sub _compute_flags_for_instlist {
 
     my %uniq;
     $urpm->compute_flags(
-	get_packages_list($urpm->{instlist}),
+	urpm::sys::get_packages_list($urpm->{instlist}),
 	disable_obsolete => 1,
 	callback => sub {
 	    my ($urpm, $pkg) = @_;
@@ -1861,19 +1861,4 @@ sub clean {
     }
 }
 
-
-#- get the list of packages that should not be upgraded or installed,
-#- typically from the inst.list or skip.list files.
-sub get_packages_list {
-    my ($file, $o_extra) = @_;
-    my $val = [];
-    open(my $f, '<', $file);
-    foreach (<$f>, split /,/, $o_extra || '') {
-	chomp; s/#.*$//; s/^\s*//; s/\s*$//;
-	next if $_ eq '';
-	push @$val, $_;
-    }
-    $val;
-}
-
 1;
-- 
cgit v1.2.1