Changeset 2104 in ProjectBuilder for devel/pb-modules

Timestamp:

Jul 20, 2016, 6:04:18 PM (9 years ago)

Author:

Bruno Cornec

Message:

Fix name of docker reg/repo function and fix it by invoking the older one content

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (5 diffs)

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

@@ -32 +32 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image pv_ve_docker_repo);
+our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image);
 
 ($VERSION,$REVISION) = pb_version_init();
@@ -83 +83 @@
 
 if ($vetype eq "docker") {
-    $docrepo = pv_ve_docker_repo();
+    $docrepo = pb_ve_docker_repo();
 }
 
@@ -381 +381 @@
 }
 
-# Returns the docker repository to interact with
-sub pb_ve_docker_repo {
-
-my $dockerreg = shift;
-my $docrepo = "";
-my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
-$docrepo .= $host;
-$docrepo .= ":$port" if ((defined $port) && ($port ne ""));
-$docrepo .= "$path";
-return($docrepo);
-}
-
 sub pb_ve_docker_get_image {
 
@@ -426 +414 @@
 }
 
-sub pv_ve_docker_repo {
+# Returns the docker repository to interact with
+sub pb_ve_docker_repo {
 
 my $docrepo = "";
@@ -433 +422 @@
 if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
     pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
-    $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":";
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerregistry->{$ENV{'PBPROJ'}}).":";
+    $docrepo .= $host;
+    $docrepo .= ":$port" if ((defined $port) && ($port ne ""));
+    $docrepo .= "$path";
 } else {
     my ($dockerrepository) = pb_conf_get("dockerrepository");