From: Alan Knowles <alan@akbkhome.com>
Date: Mon, 5 Dec 2011 08:38:33 +0000 (+0800)
Subject: UpdateDatabase.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=da6940b16f760b8898c8daa30601118ae61fc920

UpdateDatabase.php
UpdateDatabase.php
UpdateDatabase.php
UpdateDatabase.php
---

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index b811777f..1f5e5b9e 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -136,12 +136,12 @@ class Pman_Core_UpdateDatabase extends Pman
                 }
                 $fn = $this->convertToPG($fn);
                 
-                $cmd = "$psql_cmd -f  " . escapeshellarg($fn) ;
+                $cmd = "$psql_cmd -f  " . escapeshellarg($fn) . '2>&1' ;
                 
-                echo $cmd. ($this->cli ? "\n" : "<BR>\n");
+                echo "$fn:   $cmd ". ($this->cli ? "\n" : "<BR>\n");
                 
                 
-                //$res = `$cmd`;
+                $res = `$cmd`;
                 
             
                 unlink($fn);
@@ -203,7 +203,7 @@ class Pman_Core_UpdateDatabase extends Pman
         }
         $ret = array_merge($extra,$ret);
         
-        echo implode("\n", $ret); //exit;
+        //echo implode("\n", $ret); //exit;
         file_put_contents($fn, implode("\n", $ret));
         
         return $fn;