Changeset 1524 in ProjectBuilder

Timestamp:

May 12, 2012, 2:26:43 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Distribution.pm: check that package was installed failed because package name could be truncated if COLUMNS env var is set. Also log out missing dependencies at log level 1. Add missing newlines on some log messages. (Eric Anderson)

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -435 +435 @@
 my $deps2 = "";
 # Avoid to install what is already there
+delete $ENV{COLUMNS};
 foreach my $p (split(/\s+/,$deps)) {
     next if $p =~ /^\s*$/o;
@@ -440 +441 @@
         my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet", 1);
         next if ($res eq 0);
+        pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "deb") {
         my $res = pb_system("dpkg -L $p","","quiet", 1);
@@ -449 +451 @@
         }
         next if $ok;
+        pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "ebuild") {
     } else {
@@ -495 +498 @@
 
 if (not -f $dest) {
-    pb_log(1, "Creating new file $dest");
+    pb_log(1, "INFO: Creating new file $dest\n");
 } elsif (-f $dest && -s $dest == 0) {
-    pb_log(1, "Overwriting empty file $dest");
+    pb_log(1, "INFO: Overwriting empty file $dest\n");
 } elsif (-f $dest && compare("$src", $dest) == 0) {
-    pb_log(1, "Overwriting identical file $dest");
+    pb_log(1, "INFO: Overwriting identical file $dest\n");
 } else {
     pb_log(0, "ERROR: destination file $dest exists and is different than source $src\n");
-    pb_system("cat $dest","Dest...");
-    pb_system("cat $src","New...");
-    pb_log("Returning...\n");
+    pb_system("cat $dest","INFO: Dest...\n");
+    pb_system("cat $src","INFO: New...\n");
+    pb_log("INFO: Returning...\n");
     return(0);
 }