Indefero Commit Details

Date:

2010-08-30 08:46:05 (15 years 2 months ago)

Author:

Thomas Keller

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

6b4abac08ea0bec6c47cea052b1a1fb7faaa349e

Parents:

e789263068a7e5fd9d2d67ad3a8099108178cdb3

Message:

- PHP doesn't like the $var = <init> kind of initialization and 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

Changes:

File differences

-106
107 107
108 108
109 
109
110
110 111
111 112
112 113
... ...
127 128
128 129
129 130
130 
131
131 132
132 133
133 134
135
134 136
135 
137
138
136 139
137 140
138 141
+            escapeshellarg($dbfile)␊
        );␊
        $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) {␊
            throw new IDF_Scm_Exception(sprintf(␊
                __('The database file %s could not be created.'), $dbfile␊

␊
        $keyname = $shortname.'-server@'.$server;␊
        $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($keyname)␊
        );␊
␊
        $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) {␊
            throw new IDF_Scm_Exception(sprintf(␊
                __('The server key %s could not be created.'), $keyname␊
 ...
             escapeshellarg($dbfile)␊
         );␊
         $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) {␊
             throw new IDF_Scm_Exception(sprintf(␊
                 __('The database file %s could not be created.'), $dbfile␊
 ␊
         $keyname = $shortname.'-server@'.$server;␊
         $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($keyname)␊
         );␊
+␊
         $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) {␊
             throw new IDF_Scm_Exception(sprintf(␊
                 __('The server key %s could not be created.'), $keyname␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags