Indefero Commit Details

Date:

2010-09-12 20:13:49 (14 years 7 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:

a32d6d826570657f6ae3eba7b40de36274e3d084

Parents:

0f9f337e669ca150f3a4f090907b5f214b19145f

Message:

* its late - put_public_key of course needs a specific database * do not throw around exceptions if a key which should be removed is not found in the database

Changes:

File differences

-163
164 164
165 165
166 
167 166
168 167
169 168
... ...
184 183
185 184
186 185
187 
188 
186
187
189 188
190 189
191 
190
192 191
193 192
194 193
... ...
631 630
632 631
633 632
634 
635 
633
634
635
636
637
638
639
636 640
637 641
638 642
+                $parsed_keyinfo = IDF_Scm_Monotone_BasicIO::parse($keyinfo);␊
            }␊
            catch (Exception $e) {␊
                echo $e->getTraceAsString(); exit;␊
                throw new IDF_Scm_Exception(sprintf(␊
                    __('Could not parse key information: %s'), $e->getMessage()␊
                ));␊

            );␊
            $clientkey_pubdata = self::_mtn_exec($cmd);␊
␊
            $cmd = sprintf('au put_public_key --confdir=%s %s',␊
                escapeshellarg($projectpath),␊
            $cmd = sprintf('au put_public_key --db=%s %s',␊
                escapeshellarg($dbfile),␊
                escapeshellarg($clientkey_pubdata)␊
            );␊
            $keyinfo = self::_mtn_exec($cmd);␊
            self::_mtn_exec($cmd);␊
        }␊
␊
        //␊

            $stdio = $mtn->getStdio();␊
            // if the public key did not sign any revisions, drop it from␊
            // the database as well␊
            if (strlen($stdio->exec(array('select', 'k:' . $mtn_key_id))) == 0) {␊
                $stdio->exec(array('drop_public_key', $mtn_key_id));␊
            try {␊
                if (strlen($stdio->exec(array('select', 'k:' . $mtn_key_id))) == 0) {␊
                    $stdio->exec(array('drop_public_key', $mtn_key_id));␊
                }␊
            } catch (IDF_Scm_Exception $e) {␊
                if (strpos($e->getMessage(), 'there is no key named') === false)␊
                    throw $e;␊
            }␊
        }␊
    }␊
 ...
 ...
                 $parsed_keyinfo = IDF_Scm_Monotone_BasicIO::parse($keyinfo);␊
             }␊
             catch (Exception $e) {␊
-                echo $e->getTraceAsString(); exit;␊
                 throw new IDF_Scm_Exception(sprintf(␊
                     __('Could not parse key information: %s'), $e->getMessage()␊
                 ));␊
             );␊
             $clientkey_pubdata = self::_mtn_exec($cmd);␊
 ␊
-            $cmd = sprintf('au put_public_key --confdir=%s %s',␊
-                escapeshellarg($projectpath),␊
+            $cmd = sprintf('au put_public_key --db=%s %s',␊
+                escapeshellarg($dbfile),␊
                 escapeshellarg($clientkey_pubdata)␊
             );␊
-            $keyinfo = self::_mtn_exec($cmd);␊
+            self::_mtn_exec($cmd);␊
         }␊
 ␊
         //␊
             $stdio = $mtn->getStdio();␊
             // if the public key did not sign any revisions, drop it from␊
             // the database as well␊
-            if (strlen($stdio->exec(array('select', 'k:' . $mtn_key_id))) == 0) {␊
-                $stdio->exec(array('drop_public_key', $mtn_key_id));␊
+            try {␊
+                if (strlen($stdio->exec(array('select', 'k:' . $mtn_key_id))) == 0) {␊
+                    $stdio->exec(array('drop_public_key', $mtn_key_id));␊
+                }␊
+            } catch (IDF_Scm_Exception $e) {␊
+                if (strpos($e->getMessage(), 'there is no key named') === false)␊
+                    throw $e;␊
             }␊
         }␊
     }␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags