Changeset 48 for devel/dploy-common

Timestamp:

04/16/08 15:57:46 (4 years ago)

Author:

bruno

Message:

pb_ functions => dploy_

File:

• devel/dploy-common/lib/Dploy/Base.pm (modified) (8 diffs)

devel/dploy-common/lib/Dploy/Base.pm

@@ -58 +58 @@
 my $cmt=shift || $cmd;
 
-pb_log(0,"$cmt... ");
+dploy_log(0,"$cmt... ");
 #system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 system($cmd);
-pb_log(1,"Executing $cmd\n");
+dploy_log(1,"Executing $cmd\n");
 my $res = $?;
 if ($res == -1) {
-    pb_log(0,"failed to execute ($cmd) : $!\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    dploy_log(0,"failed to execute ($cmd) : $!\n");
+    dploy_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($res & 127) {
-    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    dploy_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
+    dploy_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($res == 0) {
-    pb_log(0,"OK\n");
+    dploy_log(0,"OK\n");
 } else {
-    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    dploy_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
+    dploy_display_file("$ENV{'PBTMP'}/system.log");
 }
 return($res);
@@ -96 +96 @@
 
 my @param = @_;
-my @return = pb_conf_get_if(@param);
+my @return = dploy_conf_get_if(@param);
 
 die "No params found for $ENV{'PBPROJ'}" if (not @return);
@@ -116 +116 @@
 my @ptr1 = ();
 my @ptr2 = ();
-@ptr1 = pb_conf_read_if("$ENV{'PBETC'}", @param) if (defined $ENV{'PBETC'});
-@ptr2 = pb_conf_read_if("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb", @param) if ((defined $ENV{'PBROOTDIR'}) and (defined $ENV{'PBPROJ'}));
+@ptr1 = dploy_conf_read_if("$ENV{'PBETC'}", @param) if (defined $ENV{'PBETC'});
+@ptr2 = dploy_conf_read_if("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb", @param) if ((defined $ENV{'PBROOTDIR'}) and (defined $ENV{'PBPROJ'}));
 
 my $p1;
 my $p2;
 
-pb_log(2,"DEBUG: pb_conf_get param1: ".Dumper(@ptr1)."\n");
-pb_log(2,"DEBUG: pb_conf_get param2: ".Dumper(@ptr2)."\n");
+dploy_log(2,"DEBUG: dploy_conf_get param1: ".Dumper(@ptr1)."\n");
+dploy_log(2,"DEBUG: dploy_conf_get param2: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -163 +163 @@
     $ptr1[$i] = $p1;
 }
-pb_log(2,"DEBUG: pb_conf_get param ptr1: ".Dumper(@ptr1)."\n");
+dploy_log(2,"DEBUG: dploy_conf_get param ptr1: ".Dumper(@ptr1)."\n");
 return(@ptr1);
 }
@@ -177 +177 @@
 open(CONF,$conffile) || return((undef));
 close(CONF);
-return(pb_conf_read($conffile,@param));
+return(dploy_conf_read($conffile,@param));
 }
 
@@ -193 +193 @@
 while(<CONF>) {
     if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-        pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
+        dploy_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
         $h{$1}{$2}=$3;
     }
@@ -210 +210 @@
 my $uri = shift || undef;
 
-pb_log(2,"DEBUG: uri:$uri\n");
+dploy_log(2,"DEBUG: uri:$uri\n");
 # A URL has the format protocol://[ac@]host[:port][path[?query][#fragment]].
 # Cf man URI
@@ -224 +224 @@
 $port = "" if (not defined $port);
 
-pb_log(2,"DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n");
+dploy_log(2,"DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n");
 return($scheme, $account, $host, $port, $path);
 }