natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- PHP doesn't like the $var = <init> kind of initialization and

Browse Source 
won't return variable references properly, so revert that change
  again
- since we're requiring 0.99 now, we also have to use au generate_key
  instead of au genkey
This commit is contained in:
Thomas Keller 2010-08-30 13:46:05 +00:00
parent e789263068
commit 6b4abac08e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/IDF/Plugin/SyncMonotone.php
View File

@ -106,7 +106,8 @@ class IDF_Plugin_SyncMonotone
escapeshellarg($dbfile) escapeshellarg($dbfile)
); );
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;
$ll = exec($cmd, $output = array(), $return = 0); $output = $return = null;
$ll = exec($cmd, $output, $return);
if ($return != 0) { if ($return != 0) {
throw new IDF_Scm_Exception(sprintf( throw new IDF_Scm_Exception(sprintf(
__('The database file %s could not be created.'), $dbfile __('The database file %s could not be created.'), $dbfile
@ -127,12 +128,14 @@ class IDF_Plugin_SyncMonotone
$keyname = $shortname.'-server@'.$server; $keyname = $shortname.'-server@'.$server;
$cmd = sprintf( $cmd = sprintf(
Pluf::f('mtn_path', 'mtn').' au genkey --confdir=%s %s ""', Pluf::f('mtn_path', 'mtn').' au generate_key --confdir=%s %s ""',
escapeshellarg($projectpath), escapeshellarg($projectpath),
escapeshellarg($keyname) escapeshellarg($keyname)
); );
$cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;
$ll = exec($cmd, $output = array(), $return = 0); $output = $return = null;
$ll = exec($cmd, $output, $return);
if ($return != 0) { if ($return != 0) {
throw new IDF_Scm_Exception(sprintf( throw new IDF_Scm_Exception(sprintf(
__('The server key %s could not be created.'), $keyname __('The server key %s could not be created.'), $keyname