Changeset 341


Ignore:
Timestamp:
Mar 29, 2008, 6:30:16 PM (12 years ago)
Author:
bruno
Message:

Fix some merging issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r340 r341  
    292292# Old syntax
    293293#getopts('a:fhi:l:m:P:p:qr:s:vV:',\%opts);
    294 getopts('a:fhi:l:m:P:p:qr:s:tvV:',\%opts);
    295294
    296295my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
     
    435434    my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
    436435    @pkgs = @$ptr;
    437     my ($uri) = pb_conf_get("pburl");
    438     my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri->{$ENV{'PBPROJ'}});
    439 
    440     # Some variable initialization depending on CMS type
    441     my ($scheme,$uri)=pb_cms_init($pbinit);
     436
     437    my ($scheme, $uri) = pb_cms_init($pbinit);
    442438
    443439    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
Note: See TracChangeset for help on using the changeset viewer.