Indefero

Indefero Commit Details

Date:2010-09-13 03:13:49 (4 years 1 month 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:
Msrc/IDF/Plugin/SyncMonotone.php (3 diffs)

File differences

src/IDF/Plugin/SyncMonotone.php
163163
164164
165165
166
167166
168167
169168
......
184183
185184
186185
187
188
186
187
189188
190189
191
190
192191
193192
194193
......
631630
632631
633632
634
635
633
634
635
636
637
638
639
636640
637641
638642
$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;
}
}
}

Archive Download the corresponding diff file