Changeset 2176 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Feb 14, 2017, 7:17:12 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix package based installation of pb

File:

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

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

@@ -549 +549 @@
     pb_system("cat $src","INFO: New...\n");
     pb_log("INFO: Returning...\n");
-    return(0);
-}
-# TRUE
-return(1);
+    return(1);
+}
+return(0);
 }
 
@@ -616 +615 @@
             }
             my $dest = "$dirdest/$bn";
-            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
@@ -629 +628 @@
         if ($bn =~ /\.sources.list$/) {
             my $dest = "/etc/apt/sources.list.d/$bn";
-            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");