From a231645f12e640171070a9f7fbcc737fd58afe29 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 19 Apr 2014 12:58:53 +0200
Subject: simplify using cat*()

---
 lib/Iurt/Chroot.pm |  4 +---
 ulri               | 10 ++--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 9ea6362..4c57dcf 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -38,9 +38,7 @@ sub clean_chroot {
         _clean_mounts($run, $config, $chroot);
 
 	# Do not run rm if there is something still mounted there
-	open(my $FP, "/proc/mounts") or die $!;
-	my @list = grep { /$chroot/ } <$FP>;
-	close($FP);
+	my @list = grep { /$chroot/ } cat_or_die('/proc/mounts');
 	if (@list) {
 	    # Still referenced
 	    plog('ERROR', "Not cleaning chroot (mount points still in use)");
diff --git a/ulri b/ulri
index 0e8f36e..8c5163a 100755
--- a/ulri
+++ b/ulri
@@ -280,14 +280,8 @@ sub todo_func {
 
     if ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_.*\.deps$/) {
 	my $prefix = $1;
-	my @deps;
-
-	open my $FILE, "<$todo/$f/$m/$s/$r";
-	while (my $line = <$FILE>) {
-	    chomp $line;
-	    plog('DEBUG', "Adding dependency $line ($prefix)");
-	    push @deps,$line;
-	}
+	my @deps = map { chomp(); $_ } cat_("$todo/$f/$m/$s/$r");
+	plog('DEBUG', "Adding dependency $_ ($prefix)") foreach @deps;
 
 	$pkg_tree{$prefix}{deps} = \@deps;
     }
-- 
cgit v1.2.1