- in urpmi.addmedia, if a "with" argument was provided on the command-line,

  don't probe for synthesis or hdlist files in other directories
- check return value from system("cp"...) and log errors

1 files changed, 6 insertions, 2 deletions

diff --git a/urpmi b/urpmi
index 32affb6f..1d0746c5 100755
--- a/urpmi
+++ b/urpmi
@@ -231,7 +231,8 @@ if ($bug) {
 	    ? N("Directory [%s] already exists, please use another directory for bug report or delete it")
 	    : N("Unable to create directory [%s] for bug report"), $bug));
     #- copy all synthesis file used, along with configuration of urpmi
-    system("cp", "-af", $urpm->{skiplist}, $urpm->{instlist}, $bug);
+    system("cp", "-af", $urpm->{skiplist}, $urpm->{instlist}, $bug)
+	and die N("Copying failed");
     #- allow log file.
     $log = "$bug/urpmi.log";
 }
@@ -348,7 +349,10 @@ if ($bug) {
     $urpm->write_config;
     #- handle local packages, copy them directly in bug environment.
     foreach (keys %requested) {
-	$urpm->{source}{$_} and system "cp", "-af", $urpm->{source}{$_}, $bug;
+	if ($urpm->{source}{$_}) {
+	    system "cp", "-af", $urpm->{source}{$_}, $bug
+		and die N("Copying failed");
+	}
     }
 }