<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/569f76b146a5436aa49822c3397548a5e3cbaafe">https://github.com/macports/macports-ports/commit/569f76b146a5436aa49822c3397548a5e3cbaafe</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 569f76b  gpg_verify-1.0: Bugfix macportsuser and exit
</span>569f76b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 569f76b146a5436aa49822c3397548a5e3cbaafe
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Dec 30 07:42:10 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    gpg_verify-1.0: Bugfix macportsuser and exit
</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/59899
</span><span style='display:block; white-space:pre;color:#404040;'>    * See https://github.com/macports/macports-ports/pull/5124#pullrequestreview-336996790
</span>---
 _resources/port1.0/group/gpg_verify-1.0.tcl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gpg_verify-1.0.tcl b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b6502ca..fe8c276 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,11 @@ options gpg_verify.gpg_homedir
</span> default gpg_verify.gpg_homedir {${workpath}/.gnupg}
 
 pre-checksum {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     xinstall -o macports -m 0755 -d "[option gpg_verify.gpg_homedir]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[geteuid] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -o ${macportsuser} -d [option gpg_verify.gpg_homedir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d [option gpg_verify.gpg_homedir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 proc gpg_verify.verify_gpg_signature {pubkey_file signature_file test_file} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +64,6 @@ proc gpg_verify.verify_gpg_signature {pubkey_file signature_file test_file} {
</span>             --verify ${signature_file} ${test_file} 2>/dev/null; \
             then echo 'VERIFIED'; else echo 'UNVERIFIED'; fi"]
     if {[string trim ${gpg_verification}] != "VERIFIED"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_error "GPG signature verification failed on ${test_file} with pubkey file ${pubkey_file}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        error "GPG signature verification failed on ${test_file} with pubkey file ${pubkey_file}."
</span>     }
 }
</pre><pre style='margin:0'>

</pre>