Ignore:
Timestamp:
Feb 14, 2017, 7:17:12 PM (3 years ago)
Author:
Bruno Cornec
Message:

Fix package based installation of pb

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2171 r2176  
    549549    pb_system("cat $src","INFO: New...\n");
    550550    pb_log("INFO: Returning...\n");
    551     return(0);
    552 }
    553 # TRUE
    554 return(1);
     551    return(1);
     552}
     553return(0);
    555554}
    556555
     
    616615            }
    617616            my $dest = "$dirdest/$bn";
    618             next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
     617            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
    619618            confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
    620619            pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
     
    629628        if ($bn =~ /\.sources.list$/) {
    630629            my $dest = "/etc/apt/sources.list.d/$bn";
    631             next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
     630            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
    632631            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
    633632            pb_system("sudo apt-get update","Updating apt repository");
Note: See TracChangeset for help on using the changeset viewer.