[tor-commits] [tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path

[gk@xxxxxxxxxxxxxx]

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Thu Sep 3 11:35:34 2015 +0200

    Bug 16973: fix gpg keyring path
    
    The path defined in config.yml is relative to the tools/update-responses
    directory, but we usually run the script from the Makefile in the gitian
    directory. This patch makes it work from anywhere.
---
 tools/update-responses/update_responses |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index d238d3a..a371403 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -421,7 +421,7 @@ sub download_version {
         }
     }
     if (system('gpg', '--no-default-keyring', '--keyring',
-            $config->{download}{gpg_keyring}, '--verify',
+            "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify',
             "$tmpdir/sha256sums-unsigned-build.txt.asc",
             "$tmpdir/sha256sums-unsigned-build.txt")) {
         exit_error "Error checking gpg signature for version $version";



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits