Changeset 1576

Timestamp:

05/23/12 13:29:16 (13 months ago)

Author:

bruno

Message:

Add support of the PBVCSOPT environment variable to pass options to the VCS command such as a login/passwd authentication (useful for pbtest)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (2 diffs)
• pb/t/pbtest (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -520 +520 @@
 my $scheme = shift;
 my $cmd = "";
+my $cmdopt = "";
 
 # If there is a socks proxy to use
@@ -528 +529 @@
 }
 
+if (defined $ENV{'PBVCSOPT'}) {
+    $cmdopt .= $ENV{'PBVCSOPT'};
+}
+
 if ($scheme =~ /hg/) {
-    return($cmd."hg")
+    return($cmd."hg ".$cmdopt)
 } elsif ($scheme =~ /git/) {
-    return($cmd."git")
+    return($cmd."git ".$cmdopt)
 } elsif ($scheme =~ /svn/) {
-    return($cmd."svn")
+    return($cmd."svn ".$cmdopt)
 } elsif ($scheme =~ /svk/) {
-    return($cmd."svk")
+    return($cmd."svk ".$cmdopt)
 } elsif ($scheme =~ /cvs/) {
-    return($cmd."cvs")
+    return($cmd."cvs ".$cmdopt)
 } elsif (($scheme =~ /http/) || ($scheme =~ /ftp/)) {
     my $command = pb_check_req("wget",1);

devel/pb/t/pbtest

@@ -122 +122 @@
 sudo su - pbtest -c "cd pb ; svn co svn://localhost/pb ."
 sudo su - pbtest -c "cd pb ; touch README ; svn add README ; svn ci --username pbtest --password pbtest -m 'add readme' README"
-sudo su - pbtest -c "pb -p afio newproj afio"
+sudo su - pbtest -c "export PBVCSOPT='--username pbtest --password pbtest' ; pb -p afio newproj afio"
 cat >> /tmp/afio.pb << EOF
 defpkgdir afio = dummy