Changeset 1514

Timestamp:

05/10/12 12:47:48 (14 months ago)

Author:

bruno

Message:

r4759@localhost: bruno | 2012-05-10 11:12:46 +0200
Distribution.pm: Handle multi-line entries in debian control files. Tolerate errors from listing dependencies since we handle them in pb_distro_only_deps_needed. If the two files differ, generate more error output. (Eric Anderson as the previous patch)

File:

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

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

@@ -358 +358 @@
     next if (! /$regexp/);
     chomp();
+
+    my $nextline;
+    # Support multi-lines deps for .deb
+    if ($pbos->{type} eq 'deb') {
+        while ($nextline = <DESC>) {
+            last unless $nextline =~ /^\s+(.+)$/o;
+            $_ .= $1;
+        }
+    }
+
     # What we found with the regexp is the list of deps.
     pb_log(2,"found deps: $_\n");
@@ -373 +383 @@
     s/\s+/ /g;
     $deps .= " ".$_;
+
+    # Support multi-lines deps for .deb (fwup)
+    if (defined $nextline) {
+        $_ = $nextline;
+        redo;
+    }
 }
 close(DESC);
@@ -399 +415 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet");
+        my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet", 1);
         next if ($res eq 0);
     } elsif ($pbos->{'type'} eq "deb") {
-        my $res = pb_system("dpkg -L $p","","quiet");
+        my $res = pb_system("dpkg -L $p","","quiet", 1);
         next if ($res eq 0);
     } elsif ($pbos->{'type'} eq "ebuild") {
@@ -449 +465 @@
 my $dest = shift;
 
-if (-f $dest && -s $dest == 0) {
+if (not -f $dest) {
+    pb_log(1, "Creating new file $dest");
+} elsif (-f $dest && -s $dest == 0) {
     pb_log(1, "Overwriting empty file $dest");
 } elsif (-f $dest && compare("$src", $dest) == 0) {
     pb_log(1, "Overwriting identical file $dest");
-} elsif (not -f $dest) {
-    pb_log(1, "Creating new $dest");
 } else {
     pb_log(0, "ERROR: destination file $dest exists and is different than source $src\n");
+    pb_system("cat $dest","Dest...");
+    pb_system("cat $ENV{PBTMP}/$bn","New...");
+    pb_log("Returning...\n");
     return(0);
 }