Changeset 1113


Ignore:
Timestamp:
Nov 23, 2010, 3:45:03 PM (9 years ago)
Author:
Bruno Cornec
Message:
  • Presentation update after HP internal presentation
  • Fix a bug when building for non VCS hosted projects, we need to return in pb_cms_compliant earlier in that case and not go through the check out phase.
  • Remove ref to web commands which do not exist anymore
Location:
devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/CMS.pm

    r1107 r1113  
    669669my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
    670670
    671 if ((! -d "$ENV{$envar}") || (defined $pbinit)) {
     671if (($scheme !~ /^cvs/) || ($scheme !~ /^svn/) || ($scheme =~ /^svk/) || ($scheme !~ /^hg/) || ($scheme !~ /^git/) ) {
     672    # Do not compare if it's not a real cms
     673    return;
     674} elsif ((! -d "$ENV{$envar}") || (defined $pbinit)) {
    672675    if (defined $pbinit) {
    673676        pb_mkdir_p("$ENV{$envar}");
     
    681684        pb_cms_checkout($scheme,$uri,$ENV{$envar});
    682685    }
    683 } elsif (($scheme !~ /^cvs/) || ($scheme !~ /^svn/) || ($scheme =~ /^svk/) || ($scheme !~ /^hg/) || ($scheme !~ /^git/) ) {
    684     # Do not compare if it's not a real cms
    685     return;
    686686} else {
    687687    pb_log(1,"$uri found locally, checking content\n");
  • devel/pb/lib/ProjectBuilder/Env.pm

    r1097 r1113  
    286286return if ($action =~ /^clean$/);
    287287
    288 if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {
     288if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/)) {
    289289
    290290    #
Note: See TracChangeset for help on using the changeset viewer.