Changeset 2169 in ProjectBuilder for devel/pb-modules
- Timestamp:
- Jan 5, 2017, 2:52:50 AM (7 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2161 r2169 584 584 585 585 # The repo file can be local or remote. download or copy at the right place 586 if (($scheme eq "ftp") || ($scheme eq "http")) {586 if (($scheme eq "ftp") || ($scheme =~ /http/)) { 587 587 pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Downloading additional repository file $i"); 588 588 } else { -
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r2086 r2169 117 117 } elsif ($scheme eq "dir") { 118 118 pb_system("cp -r $path $destdir","Copying $uri from DIR to $destdir "); 119 } elsif (($scheme eq "http") || ($scheme eq "ftp")) {119 } elsif (($scheme =~ /http/) || ($scheme eq "ftp")) { 120 120 my $f = basename($path); 121 121 unlink "$ENV{'PBTMP'}/$f"; … … 377 377 $newurl = pb_vcs_mod_htftp($newurl,"svn"); 378 378 pb_system("$vcscmd copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl "); 379 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {379 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 380 380 # Nothing to do. 381 381 } else { … … 412 412 $url = pb_vcs_mod_htftp($url,"git"); 413 413 pb_system("$vcscmd clone $url $destination","Checking out $url to $destination "); 414 } elsif (($scheme eq "ftp") || ($scheme eq "http")) {414 } elsif (($scheme eq "ftp") || ($scheme =~ /http/)) { 415 415 return; 416 416 } elsif ($scheme =~ /^cvs/) { … … 456 456 pb_system("(cd $d && $vcscmd fetch)", "Updating $d "); 457 457 } 458 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {458 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 459 459 # Nothing to do. 460 460 } else { … … 482 482 } elsif ($scheme =~ /^git/) { 483 483 pb_system("cd $dir && $vcscmd commit -a -m \"$msg\"", "Checking in $dir "); 484 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {484 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 485 485 # Nothing to do. 486 486 } else { … … 508 508 pb_vcs_add($scheme,$f) if ($uri !~ /^$scheme/); 509 509 } 510 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {510 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 511 511 # Nothing to do. 512 512 } else { … … 530 530 if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) { 531 531 pb_system("$vcscmd add ".join(' ',@f),"Adding ".join(' ',@f)." to VCS "); 532 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {532 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 533 533 # Nothing to do. 534 534 } else { … … 560 560 $l++; 561 561 } 562 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|( file)\b/o) {562 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) { 563 563 $l = 0; 564 564 } else {
Note:
See TracChangeset
for help on using the changeset viewer.