Changeset 341 in ProjectBuilder

Timestamp:

Mar 29, 2008, 6:30:16 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix some merging issues

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -292 +292 @@
 # Old syntax
 #getopts('a:fhi:l:m:P:p:qr:s:vV:',\%opts);
-getopts('a:fhi:l:m:P:p:qr:s:tvV:',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -435 +434 @@
     my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
     @pkgs = @$ptr;
-    my ($uri) = pb_conf_get("pburl");
-    my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri->{$ENV{'PBPROJ'}});
-
-    # Some variable initialization depending on CMS type
-    my ($scheme,$uri)=pb_cms_init($pbinit);
+
+    my ($scheme, $uri) = pb_cms_init($pbinit);
 
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");