December 2016 - tor-commits - lists.torproject.org

[trac-email/master] Check key status
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 0e500debccc81147df0770ea8ec81cc47879b496 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:13:53 2016 +0100 Check key status --- map | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/map b/map new file mode 100755 index 0000000..25dee15 --- /dev/null +++ b/map @@ -0,0 +1,76 @@ +25FC1614B8F87B52FF2F99B962AF4031C82E0039 weasel +B1172656DFF983C3042BC699EB5A896A28988BF5 arma +B35BF85BF19489D04E28C33C21194EBB165733EA nickm +6D3111D4E0313392FE8BEDD40800D6BBDF3DCEE6 sebastian +0CC8157C2578EEE92B0745D64EFD4FDC3F46D41E karsten +C963C21D63564E2B10BB335B29846B3C683686CC mikeperry +7473902BD5CE11AD85E6FF4B7220E0935E2A64A6 sjm217 +8738A680B84B3031A630F2DB416F061063FEE659 erinn +8C4CD511095E982EB0EFBFA21E8BF34923291265 linus +8B73B5C337F84D208FF7B08BE15FE5C8792FB138 runa +68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6 atagar +30BF6A782013DCFA5985E2559D314A9A757465BC pde +FD9A6AA28193A9F03D4BF4ADC11B36DC9C7DD150 schoen +13C81580203AE18BB7C0424E09CC7F5315F271D9 asn +F808881CCDEE45FD37E968969768FD3CC48815F2 jvoisin +FB5D71D53650DE057267186385E9B0FB288D35CE n8fr8 +AD1AB35C674DF572FBCE8B0A6BC758CBC11F6276 dcf +46E5EF37DE264EA68DCF53EAE3A21297150FE210 art +91D43A5B1016CEB6D35265AE2C4B239DD876C9F6 aagbsn +A6C7B88B9583046A11C5403E0B00FB6CEBE2D002 dererk +0A6A58A14B5946ABDE18E207A3ADB67A2CDB8B35 isis +4263006A4506740FAD871430BAEBA2D7456CAD51 wseltzer +B59378C9DDEB2DFE2E29FF59D1D8B7B16BFEF7CE andrea +B181A46C9A32C67811871EE65000F2608D62BB1E hiviah +B369E7A218FECEADEB968C73CF7089E3D7FDC0D0 phw +5AE307277236D446F0DCBB8B08FD25A82EE24BFF dtauerbach +E4ACD3975427A5BA8450A1BEB01C8B006DA77FAA sukhbir +F711FA29D61F88CE6879BAD0D91A345E56B01B25 brade +2602B0DD0EB238CCE037196A0E36124F8E990F6E mcs +0603CCFD91865C17E88D4C798382C95C29023DF9 lunar +5C17616361BD9F92422AC08BB4D25A1E99999697 micah +1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA blueness +4797E7E1069D84AC4040797A5E3A93B4D4DDCD8B arlo +CE1782624600EE98764C6D9CCB8FC772D1AA1D30 sysrqb +8EDB1FD7C431791768C1C5BB34F31DCDDF3E7BB8 vmon +A405E58AB3725B396ED1B85C1318EFAC5FBBDBCE infinity0 +726824BE9D8D5CF009C5F039FF9D1C57779FB883 colin +35CD74C24A9B15A19E1A81A194373AA94B7C3223 gk +C9B8CAC3318B9A9E488359612067001B1B678A63 boklm +BDE7D5083BB35EDC7A66BD97388CE229FAC78CF7 yan +B74417EDDF22AC9F9E90F49142E86A2A11F48D36 dgoulet +879BDA5BF6B27B6127450A2503CF4A0AB3C79A63 griffin +E745A4CC726A94229B2B2DEE58C4B928A3E218F6 nima +06EA89416961993CC56ABADADC946AF05D9742E7 nickhopper +9EB1A490C73CC5D44DFB3E47BFBD1C7B8A6EC81A yawning +309EBFBA9218CBA7EE53F6F8BEDFC9BE6510B8E9 huseby +503192278D46F1EF2F3825AC815D488692B85107 pepijn +3459F9589F592CADCB07B4A384D8CC2ACB9DECA3 al +556DD043A29D0C4373872126D52512191CA14FA7 eyv +60D85B8D9A1CD2D1355EBE9F65B3F094EA3E4D61 qbi +4777535FE5471562626077B58CBF9A322861A790 hacim +8ACD146EA94CEB12E4EA691566A109189B79658F tom +E3E238BB9AE1D0226B400CAD3CBF8C99F1FAF31D jsha +53927C25AAF14FBBCAFABDA3A456E2CE540BFC0E ilv +D53C3CA4A351BB2519B13E48F6FB25C32656DE20 gacar +EFB18323F05613717A7CFB6993C1C1760B47D56D sina +8F2AF9B6D4A14D03FDF1B2983224499415064C7B isabela +20B24CEFE6AFD6150B6A6F18D752F538C0D38C3A arthuredelstein +7C91C7C864A1CA45350E026ECD3AAD80EBBEF554 kate +4961E37F7CD50B0363E8DB24B9BF49229DB63524 amoghbl1 +9032CAE4CBFA933A5A2145D5FF97C53F183C045D special +7DE3CA8649E4A77CC2CA6CDC65791E7E0DB60F11 andz +2DA81D01455C3A0032198850F305447AF806D46B juga +2ACA8DD4444E358FB72E8C3C7196690D9E03CDFD cristobal +128228D61284595570B280FAAD97364FC20BEC80 kernelcorn +28BC839890D4599EC00FD544FB16E10EC13C40E5 serene +9C64F9DA7A501361533ECA8A325DAA60 usura +977A04EC512A9D0DB4A56E0ECDCAE8ED6842C592 legind +FBF0E7DB1433018EE52D0DDA9FC34089CBE83CA3 alison +B788B36768B69B4DD8E1F69E75256C22E303259C iwakeh +C8556CED5D90A0C529F64D43450CBA7F968F094B teor +A8F7BA5041E133339CBA169676D58093F540ABCD irl +FA0AC9BE2881B3479F4FC0D7BE70F8265ED28FA2 linda +4F95A91F7B3487230BC9CCF5B5FB9E3E3661A436 peterh +E7CC8108A3A5285B84F3EC1714F617266D4EEB80 bwheeler +6864C734AD972957FE938866A38425F1767BB67C hiro

1 0

[trac-email/master] Remove GPG signature from message body
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit c7934342e84017e49cc2f98771b15b260fcb1b20 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 14:14:38 2016 +0100 Remove GPG signature from message body --- notify.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/notify.py b/notify.py index 9224231..5d8f886 100755 --- a/notify.py +++ b/notify.py @@ -28,9 +28,10 @@ def get_message_body(message): body = '' for payload in message.get_payload(): body = body.join(payload.get_payload()) - return body + return body.split('-----BEGIN PGP SIGNATURE-----')[0] + else: - return message.get_payload() + return message.get_payload().split('-----BEGIN PGP SIGNATURE-----')[0] def verify_user_permissions(env, user, permission): ps = PermissionSystem(env)

1 0

[webwml/master] Adding Tor Browser sandbox to website
by gk＠torproject.org 14 Dec '16

14 Dec '16

commit 10c10f28a013a8b89f6a9ba2a4d969b4749e6e2c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 14 12:29:44 2016 +0000 Adding Tor Browser sandbox to website --- include/versions.wmi | 1 + projects/en/torbrowser.wml | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/include/versions.wmi b/include/versions.wmi index ed6d397..40bc1bb 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -27,6 +27,7 @@ <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-12-13</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a6</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-14</define-tag> +<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.2</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 45a46fb..a628d28 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -562,6 +562,33 @@ </table> </div> </div> + <hr> + <p></p> + <div id="downloads-sandbox" class="anchor"></div> + <center><h3>Tor Browser Sandbox</h3></center> + <div class="pjtext"> + <div class="dltable" style="margin-top: -35px;"> + <table> + <thead> + <tr> + <th><br>Language</th> + <th>Linux<br><em>(<version-torbrowsersandboxlinux>)</em></th> + </tr> + </thead> + <tbody> + <tr class="alt"> + <td>All</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/sandbox-<version-torbrowsersandboxlinux>-linux32.zip">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/sandbox-<version-torbrowsersandboxlinux>-linux32.zip.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/sandbox-<version-torbrowsersandboxlinux>-linux64.zip">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/sandbox-<version-torbrowsersandboxlinux>-linux64.zip.asc">sig</a>)</em> + </td> + </tr> + </tbody> + </table> + </div> + </div> + </div> </div>

1 0

[webwml/master] Bug 20901: Switch pt-PT to pt-BR for Tor Browser alphas
by gk＠torproject.org 14 Dec '16

14 Dec '16

commit 51fbb79d7785d2b397a1b87b364c242f23bf06b5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 14 12:08:56 2016 +0000 Bug 20901: Switch pt-PT to pt-BR for Tor Browser alphas --- projects/en/torbrowser.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 19f12e2..45a46fb 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -470,17 +470,17 @@ <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pl.tar.xz.asc">sig</a>)</em></td> </tr> <tr> - <td>Português (pt-PT)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe">32/64-bit</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-PT.dmg">64-bit</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-PT.dmg.asc">sig</a>)</em> + <td>Português (pt-BR)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-BR.exe">32/64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-BR.exe.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-BR.dmg">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-BR.dmg.asc">sig</a>)</em>  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz">32-bit</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz.asc">sig</a>)</em> - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz">64-bit</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-BR.tar.xz">32-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-BR.tar.xz.asc">sig</a>)</em> + • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-BR.tar.xz">64-bit</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-BR.tar.xz.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>Русский (ru)</td>

1 0

[webwml/master] Adding new Tor Browser alpha (6.5a6)
by gk＠torproject.org 14 Dec '16

14 Dec '16

commit 187d6039badfaa5b11e041b87aaefdc8d7e2d901 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 14 12:38:14 2016 +0000 Adding new Tor Browser alpha (6.5a6) --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 9879df0..ed6d397 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.8</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a5</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a6</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-12-13</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-12-1</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-12-14</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-12-13</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-14</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index f681596..d593897 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -12,5 +12,11 @@ "6.5a5-MacOS", "6.5a5-Windows", "6.5a5-hardened", -"6.5a5-hardened-Linux" +"6.5a5-hardened-Linux", +"6.5a6", +"6.5a6-Linux", +"6.5a6-MacOS", +"6.5a6-Windows", +"6.5a6-hardened", +"6.5a6-hardened-Linux" ]

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit fcd195dcbc281ec9536bfbe73584b0b38de0d619 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 11:48:25 2016 +0000 Update translations for tor-browser-manual_completed --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 1e7f374..af5eec4 100644 --- a/es/es.po +++ b/es/es.po @@ -1,14 +1,14 @@ # Translators: # strel <strelnic(a)gmail.com>, 2016 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # Joaquín Tita <carpincho(a)gmail.com>, 2016 # Lena <lenazun(a)gmail.com>, 2016 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Lena <lenazun(a)gmail.com>, 2016\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "reconocimiento-a-los-traductores" +msgstr "reconocimientos-a-los-traductores" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 7f98a82abb6502a85b1ed9494cc076e0e5631ea1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 11:48:21 2016 +0000 Update translations for tor-browser-manual --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 1e7f374..af5eec4 100644 --- a/es/es.po +++ b/es/es.po @@ -1,14 +1,14 @@ # Translators: # strel <strelnic(a)gmail.com>, 2016 -# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 # Joaquín Tita <carpincho(a)gmail.com>, 2016 # Lena <lenazun(a)gmail.com>, 2016 +# eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Lena <lenazun(a)gmail.com>, 2016\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>, 2016\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "reconocimiento-a-los-traductores" +msgstr "reconocimientos-a-los-traductores" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit f681ec056f19f3cb53c7209cabe29482a2f85035 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 11:45:19 2016 +0000 Update translations for whisperback_completed --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index d5abf29..935e7f7 100644 --- a/es/es.po +++ b/es/es.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-12-09 13:10+0000\n" +"PO-Revision-Date: 2016-12-14 11:21+0000\n" "Last-Translator: Noel Torres <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 3d027d11dcde1f60ca9ccf07cff258cbe5fc307a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 11:45:16 2016 +0000 Update translations for whisperback --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index d5abf29..935e7f7 100644 --- a/es/es.po +++ b/es/es.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-12-09 13:10+0000\n" +"PO-Revision-Date: 2016-12-14 11:21+0000\n" "Last-Translator: Noel Torres <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[trac-email/master] Clean up scripts and set log messages
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 5e70f3018f6515ab3a1165e2096dc6eb13d5dc6e Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 12:37:56 2016 +0100 Clean up scripts and set log messages --- notify.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/notify.py b/notify.py index 25992d4..9224231 100755 --- a/notify.py +++ b/notify.py @@ -15,7 +15,7 @@ def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') verified = gpg.verify(message) if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: - with open('bin/map', 'rb') as csvfile: + with open('/home/tracadm/bin/map', 'rb') as csvfile: keysreader = csv.reader(csvfile, delimiter=' ') for row in keysreader: k = row[0] @@ -50,7 +50,10 @@ def find_or_create_ticket(message, env): t_id = ticket_id.group(1) tkt = Ticket(env, int(t_id)) if verify_user_permissions(env, reporter, 'TICKET_MODIFY'): - tkt.save_changes(comment=body) + if tkt.save_changes(comment=body): + return tkt + else: + return False else: if verify_user_permissions(env, reporter, 'TICKET_CREATE'): summary = message['Subject'] @@ -64,7 +67,10 @@ def find_or_create_ticket(message, env): tkt['description'] = body tkt['status'] = 'new' tkt['priority'] = 'medium' - tkt.insert() + if tkt.insert(): + return tkt + else: + return False # Open logs file with open('/home/tracadm/log/test.log', 'w') as f: @@ -82,4 +88,10 @@ with open('/home/tracadm/log/test.log', 'w') as f: if verified: # Find or create ticket f.write('GPG verified') - find_or_create_ticket(msg, env) + tkt = find_or_create_ticket(msg, env) + if tkt: + f.write(str(tkt)) + else: + f.write('Could not create Ticket. I should send an email back I suppose') + else: + f.write('Could not verify GPG. I should send an email back I suppose')

1 0