Changeset 1520 in ProjectBuilder for devel

Timestamp:

May 12, 2012, 1:30:32 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix an error introduced when isolating the new pb_distro_compare_repo function (Bruno Cornec)
• pbdistrocheck: hack so that we can have one pb package that just works everywhere (Need a special use lib for opensuse) (Eric Anderson)

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb-modules/bin/pbdistrocheck

@@ -12 +12 @@
 use Data::Dumper;
 use lib qw (lib);
+use lib '/usr/share/perl5'; # mandatory for opensuse
 use ProjectBuilder::Distribution;
 use ProjectBuilder::Base;

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

@@ -503 +503 @@
     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_system("cat $src","New...");
     pb_log("Returning...\n");
     return(0);