Changeset 2171 in ProjectBuilder

Timestamp:

Jan 7, 2017, 1:17:37 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Fix #152: do not exit loop of repos to handled to early in order to continue handling next repos

File:

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

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

@@ -580 +580 @@
 foreach my $i (split(/,/,$param)) {
 
+    pb_log(1,"Adding repository defined by $i\n");
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($i);
     my $bn = basename($i);
@@ -615 +616 @@
             }
             my $dest = "$dirdest/$bn";
-            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
             confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
-            pb_system("sudo mv $ENV{'PBTMP'}/$bn $dirdest/$bn","Adding $reponame repository") if (not -f "$dirdest/$bn");
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
         } elsif ($bn =~ /\.addmedia/) {
             # URPMI repo
@@ -628 +629 @@
         if ($bn =~ /\.sources.list$/) {
             my $dest = "/etc/apt/sources.list.d/$bn";
-            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");