<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9e45d667ffad518813bdaad9bb26c357e7f038df">https://github.com/macports/macports-base/commit/9e45d667ffad518813bdaad9bb26c357e7f038df</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9e45d667 Improve deactivate/unmap failure error message
</span>9e45d667 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e45d667ffad518813bdaad9bb26c357e7f038df
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Sep 10 12:31:11 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Improve deactivate/unmap failure error message
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When the registry fails to deactivate or unmap a file, say which file it
</span><span style='display:block; white-space:pre;color:#404040;'> is.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61154
</span>---
src/cregistry/entry.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/entry.c b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 676c3f87..017c181f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -895,8 +895,8 @@ int reg_entry_unmap(reg_entry* entry, char** files, int file_count,
</span> switch (r) {
case SQLITE_DONE:
if (sqlite3_changes(reg->db) == 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reg_throw(errPtr, REG_INVALID, "this entry "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "does not own the given file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reg_throw(errPtr, REG_INVALID, "%s is not "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "owned by this entry", files[i]);
</span> result = 0;
} else {
sqlite3_reset(stmt);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1211,8 +1211,8 @@ int reg_entry_deactivate(reg_entry* entry, char** files, int file_count,
</span> switch (r) {
case SQLITE_DONE:
if (sqlite3_changes(reg->db) == 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reg_throw(errPtr, REG_INVALID, "this entry "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "does not own the given file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reg_throw(errPtr, REG_INVALID, "%s is not "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "owned by this entry", files[i]);
</span> result = 0;
} else {
sqlite3_reset(stmt);
</pre><pre style='margin:0'>
</pre>