April 2017 - tor-commits - lists.torproject.org

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit c3c6c4158293020cf8a6ae5edca59c4334bd2292 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 10:48:14 2017 +0000 Update translations for tails-greeter-2 --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index f512127..8f57b9b 100644 --- a/es/es.po +++ b/es/es.po @@ -135,7 +135,7 @@ msgstr "_Idioma" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "Configuración del teclado" +msgstr "Configuración del _teclado" #: ../data/greeter.ui.h:27 msgid "_Formats" @@ -243,7 +243,7 @@ msgstr "Activada (predeterminado) " #: ../data/greeter.ui.h:49 msgid "_Network Connection" -msgstr "Conexiones de red" +msgstr "Conexiones de _red" #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382 msgid "Direct (default)" @@ -251,7 +251,7 @@ msgstr "Directa (predeterminado) " #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "Camuflar como Windows" +msgstr "Camuflar como _Windows" #: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy" @@ -291,7 +291,7 @@ msgstr "Cerrar " #: ../tailsgreeter/gui.py:721 msgid "_Start Tails" -msgstr "Iniciar Tails " +msgstr "_Iniciar Tails " #. Translators: translate to default:RTL if your language #. is written from right to left

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit 506509cdcf921db44b862096b92481402c51cdd4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 10:46:20 2017 +0000 Update translations for tails-misc_completed --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index fee5759..334365e 100644 --- a/es.po +++ b/es.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-04-06 21:07+0200\n" -"PO-Revision-Date: 2017-04-07 10:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-04-18 10:42+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit 80235285670dd3f75314964426d3f65a1e466398 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 10:46:17 2017 +0000 Update translations for tails-misc --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index fee5759..334365e 100644 --- a/es.po +++ b/es.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-04-06 21:07+0200\n" -"PO-Revision-Date: 2017-04-07 10:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-04-18 10:42+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit 6db63ed584ad9d7cbfafb78047e631cafc170436 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 10:45:21 2017 +0000 Update translations for whisperback_completed --- es/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/es.po b/es/es.po index cec07a4..a010776 100644 --- a/es/es.po +++ b/es/es.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 14:12+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2017-04-18 10:43+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit 8de5a7359a63e8aa1617cc20964471667a535994 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 10:45:14 2017 +0000 Update translations for whisperback --- es/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/es.po b/es/es.po index cec07a4..a010776 100644 --- a/es/es.po +++ b/es/es.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 14:12+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2017-04-18 10:43+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit d98f2bd4b5a2ad739155234953c5bc4882643117 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 09:19:21 2017 +0000 Update translations for tails-greeter-2 --- fil/fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/fil.po b/fil/fil.po index 7a3c10e..69c26ff 100644 --- a/fil/fil.po +++ b/fil/fil.po @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fil\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n == 1 || n==2 || n==3) || (n % 10 != 4 || n % 10 != 6 || n % 10 != 9);\n" #: ../data/greeter.ui.h:1 msgid "Administration Password"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 18 Apr '17

18 Apr '17

commit 03975d36196321d2078e5443606e7527bd305429 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 18 08:49:55 2017 +0000 Update translations for tor-browser-manual --- fil/fil.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fil/fil.po b/fil/fil.po index 9693d7e..6c0a54f 100644 --- a/fil/fil.po +++ b/fil/fil.po @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fil\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n == 1 || n==2 || n==3) || (n % 10 != 4 || n % 10 != 6 || n % 10 != 9);\n" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_"

1 0

[stem/master] tor-prompt --run argument for running commands
by atagar＠torproject.org 17 Apr '17

17 Apr '17

commit d14fc24d02bd73c45963d0a6edfabdb93812b0a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 17 12:49:06 2017 -0700 tor-prompt --run argument for running commands Neat idea from adrelanos on... https://trac.torproject.org/projects/tor/ticket/21541 Adding a --run argument that can either be used to run a command... tor-prompt --run 'GETINFO version' ... or a file with a series of commands... tor-prompt --run /home/atagar/tor_commands_to_run --- docs/change_log.rst | 4 ++++ stem/interpreter/__init__.py | 44 +++++++++++++++++++++----------------- stem/interpreter/arguments.py | 10 ++++++++- stem/interpreter/commands.py | 6 +++++- stem/interpreter/settings.cfg | 2 ++ stem/util/system.py | 2 +- test/integ/installation.py | 4 ++++ test/integ/interpreter.py | 35 ++++++++++++++++++++++++++++++ test/settings.cfg | 1 + test/unit/interpreter/arguments.py | 6 ++++++ 10 files changed, 91 insertions(+), 23 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index e9b6323..e988c61 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -65,6 +65,10 @@ The following are only available within Stem's `git repository * Added timeout argument to :func:`~stem.util.system.call` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` + * **Interpreter** + + * Added a '--run [command or path]' argument to invoke specific commands (:trac:`21541`) + .. _version_1.5: Version 1.5 (November 20th, 2016) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 237a781..8cdbb3c 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -60,7 +60,7 @@ def main(): print(stem.interpreter.arguments.get_help()) sys.exit() - if args.disable_color: + if args.disable_color or not sys.stdout.isatty(): global PROMPT stem.util.term.DISABLE_COLOR_SUPPORT = True PROMPT = '>>> ' @@ -76,7 +76,8 @@ def main(): print(format(msg('msg.tor_unavailable'), *ERROR_OUTPUT)) sys.exit(1) else: - print(format(msg('msg.starting_tor'), *HEADER_OUTPUT)) + if not args.run_cmd and not args.run_path: + print(format(msg('msg.starting_tor'), *HEADER_OUTPUT)) control_port = '9051' if args.control_port == 'default' else str(args.control_port) @@ -124,25 +125,28 @@ def main(): interpreter = stem.interpreter.commands.ControlInterpreter(controller) - for line in msg('msg.startup_banner').splitlines(): - line_format = HEADER_BOLD_OUTPUT if line.startswith(' ') else HEADER_OUTPUT - print(format(line, *line_format)) - - print('') - - while True: + if args.run_cmd: + interpreter.run_command(args.run_cmd, print_response = True) + elif args.run_path: try: - prompt = '... ' if interpreter.is_multiline_context else PROMPT + for line in open(args.run_path).readlines(): + interpreter.run_command(line.strip(), print_response = True) + except IOError as exc: + print(format(msg('msg.unable_to_read_file', path = args.run_path, error = exc), *ERROR_OUTPUT)) + sys.exit(1) - if stem.prereq.is_python_3(): - user_input = input(prompt) - else: - user_input = raw_input(prompt) + else: + for line in msg('msg.startup_banner').splitlines(): + line_format = HEADER_BOLD_OUTPUT if line.startswith(' ') else HEADER_OUTPUT + print(format(line, *line_format)) - response = interpreter.run_command(user_input) + print('') - if response is not None: - print(response) - except (KeyboardInterrupt, EOFError, stem.SocketClosed) as exc: - print('') # move cursor to the following line - break + while True: + try: + prompt = '... ' if interpreter.is_multiline_context else PROMPT + user_input = input(prompt) if stem.prereq.is_python_3() else raw_input(prompt) + interpreter.run_command(user_input, print_response = True) + except (KeyboardInterrupt, EOFError, stem.SocketClosed) as exc: + print('') # move cursor to the following line + break diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index 010aa3f..3160183 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -7,6 +7,7 @@ Commandline argument parsing for our interpreter prompt. import collections import getopt +import os import stem.interpreter import stem.util.connection @@ -18,12 +19,14 @@ DEFAULT_ARGS = { 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, 'tor_path': 'tor', + 'run_cmd': None, + 'run_path': None, 'disable_color': False, 'print_help': False, } OPT = 'i:s:h' -OPT_EXPANDED = ['interface=', 'socket=', 'tor=', 'no-color', 'help'] +OPT_EXPANDED = ['interface=', 'socket=', 'tor=', 'run=', 'no-color', 'help'] def parse(argv): @@ -71,6 +74,11 @@ def parse(argv): args['user_provided_socket'] = True elif opt in ('--tor'): args['tor_path'] = arg + elif opt in ('--run'): + if os.path.exists(arg): + args['run_path'] = arg + else: + args['run_cmd'] = arg elif opt == '--no-color': args['disable_color'] = True elif opt in ('-h', '--help'): diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 366f256..4d845a0 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -294,13 +294,14 @@ class ControlInterpreter(code.InteractiveConsole): return format(response, *STANDARD_OUTPUT) @uses_settings - def run_command(self, command, config): + def run_command(self, command, config, print_response = False): """ Runs the given command. Requests starting with a '/' are special commands to the interpreter, and anything else is sent to the control port. :param stem.control.Controller controller: tor control connection :param str command: command to be processed + :param bool print_response: prints the response to stdout if true :returns: **list** out output lines, each line being a list of (msg, format) tuples @@ -374,4 +375,7 @@ class ControlInterpreter(code.InteractiveConsole): output += '\n' # give ourselves an extra line before the next prompt + if print_response and output is not None: + print(output) + return output diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index 1c6b27f..cc8da37 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -18,6 +18,7 @@ msg.help | -s, --socket SOCKET_PATH attach using unix domain socket if present, | SOCKET_PATH defaults to: {socket} | --tor PATH tor binary if tor isn't already running +| --run executes the given command or file of commands | --no-color disables colorized output | -h, --help presents this help | @@ -43,6 +44,7 @@ msg.startup_banner msg.tor_unavailable Tor isn't running and the command currently isn't in your PATH. msg.unable_to_start_tor Unable to start tor: {error} +msg.unable_to_read_file Unable to read {path}: {error} msg.starting_tor |Tor isn't running. Starting a temporary Tor instance for our interpreter to diff --git a/stem/util/system.py b/stem/util/system.py index a3ec756..4b705f3 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1072,7 +1072,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = Non if isinstance(command, str): command_list = command.split(' ') else: - command_list = command + command_list = map(str, command) exit_status, runtime, stdout, stderr = None, None, None, None start_time = time.time() diff --git a/test/integ/installation.py b/test/integ/installation.py index ad21fd0..4d68988 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -1,3 +1,7 @@ +""" +Tests installation of our library. +""" + import glob import os import shutil diff --git a/test/integ/interpreter.py b/test/integ/interpreter.py new file mode 100644 index 0000000..4681c57 --- /dev/null +++ b/test/integ/interpreter.py @@ -0,0 +1,35 @@ +""" +Tests invocation of our interpreter. +""" + +import os +import tempfile +import unittest + +import stem.util.system + +import test.runner +import test.util + +PROMPT_CMD = os.path.join(test.util.STEM_BASE, 'tor-prompt') + + +class TestInterpreter(unittest.TestCase): + def test_running_command(self): + expected = ['250-config-file=%s' % test.runner.get_runner().get_torrc_path(), '250 OK'] + self.assertEqual(expected, stem.util.system.call([PROMPT_CMD, '--interface', test.runner.CONTROL_PORT, '--run', 'GETINFO config-file'])) + + def test_running_file(self): + expected = [ + '250-config-file=%s' % test.runner.get_runner().get_torrc_path(), + '250 OK', + '', + '250-version=%s' % test.util.tor_version(), + '250 OK', + ] + + with tempfile.NamedTemporaryFile(prefix = 'test_commands.') as tmp: + tmp.write('GETINFO config-file\nGETINFO version') + tmp.flush() + + self.assertEqual(expected, stem.util.system.call([PROMPT_CMD, '--interface', test.runner.CONTROL_PORT, '--run', tmp.name])) diff --git a/test/settings.cfg b/test/settings.cfg index 1d011f9..11137b4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -226,6 +226,7 @@ test.integ_tests |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem |test.integ.installation.TestInstallation +|test.integ.interpreter.TestInterpreter |test.integ.descriptor.remote.TestDescriptorDownloader |test.integ.descriptor.server_descriptor.TestServerDescriptor |test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor diff --git a/test/unit/interpreter/arguments.py b/test/unit/interpreter/arguments.py index 6a765b1..df81e7e 100644 --- a/test/unit/interpreter/arguments.py +++ b/test/unit/interpreter/arguments.py @@ -51,6 +51,12 @@ class TestArgumentParsing(unittest.TestCase): for invalid_input in invalid_inputs: self.assertRaises(ValueError, parse, ['--interface', invalid_input]) + def test_run_with_command(self): + self.assertEqual('GETINFO version', parse(['--run', 'GETINFO version']).run_cmd) + + def test_run_with_path(self): + self.assertEqual(__file__, parse(['--run', __file__]).run_path) + def test_get_help(self): help_text = get_help() self.assertTrue('Interactive interpreter for Tor.' in help_text)

1 0

[gitian-builder/tor-browser-builder-4] Increase base VM size from 15360M to 20480M.
by gk＠torproject.org 17 Apr '17

17 Apr '17

commit 6185a530122f5476335bcd46dba6a3e8b3eefed8 Author: David Fifield <fifield(a)eecs.berkeley.edu> Date: Sat Apr 15 18:20:45 2017 -0700 Increase base VM size from 15360M to 20480M. Needed to hold the webrtc source code. https://bugs.torproject.org/21954#comment:2 --- bin/make-base-vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index 9e796eb..4ada11f 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -172,7 +172,7 @@ if [ $LXC = "1" ]; then sudo cp $OUT-bootstrap/usr/lib/i386-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc fi fi - dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=15360 + dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=20480 /sbin/mkfs.ext4 -F $OUT-lxc t=`mktemp -d gitian.XXXXXXXX` sudo mount $OUT-lxc $t @@ -191,7 +191,7 @@ else libexec/config-bootstrap-fixup rm -rf $OUT - env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 20000 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup + env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 20480 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT # bootstrap-fixup is done on first boot

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-1] Bug 1351071: Get rid of pre-generated startup cache r=glandium
by gk＠torproject.org 17 Apr '17

17 Apr '17

commit ec0b55bdfb638c63f30116b19583456632ad708d Author: Chris AtLee <catlee(a)mozilla.com> Date: Tue Apr 4 09:26:25 2017 -0400 Bug 1351071: Get rid of pre-generated startup cache r=glandium MozReview-Commit-ID: BcWcqEKwGBv --HG-- extra : rebase_source : 4bd21805a89359a5a2ed7ffd2ee2b76cf1e9e634 --- python/mozbuild/mozpack/packager/formats.py | 7 +- python/mozbuild/mozpack/packager/unpack.py | 8 +-- .../mozbuild/mozpack/test/test_packager_formats.py | 2 - toolkit/mozapps/installer/packager.py | 74 ---------------------- 4 files changed, 3 insertions(+), 88 deletions(-) diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index c4adaba..be5fafe 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -23,11 +23,6 @@ from mozpack.copier import ( Jarrer, ) -STARTUP_CACHE_PATHS = [ - 'jsloader', - 'jssubloader', -] - ''' Formatters are classes receiving packaging instructions and creating the appropriate package layout. @@ -321,4 +316,4 @@ class OmniJarSubFormatter(PiecemealFormatter): 'greprefs.js', 'hyphenation', 'update.locale', - ] or path[0] in STARTUP_CACHE_PATHS + ] diff --git a/python/mozbuild/mozpack/packager/unpack.py b/python/mozbuild/mozpack/packager/unpack.py index fa2b474..3f6633e 100644 --- a/python/mozbuild/mozpack/packager/unpack.py +++ b/python/mozbuild/mozpack/packager/unpack.py @@ -23,10 +23,7 @@ from mozpack.copier import ( FileCopier, ) from mozpack.packager import SimplePackager -from mozpack.packager.formats import ( - FlatFormatter, - STARTUP_CACHE_PATHS, -) +from mozpack.packager.formats import FlatFormatter from urlparse import urlparse @@ -188,8 +185,7 @@ def unpack_to_registry(source, registry): finder = UnpackFinder(source) packager = SimplePackager(FlatFormatter(registry)) for p, f in finder.find('*'): - if mozpath.split(p)[0] not in STARTUP_CACHE_PATHS: - packager.add(p, f) + packager.add(p, f) packager.close() diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py index 1af4336..ca141b0 100644 --- a/python/mozbuild/mozpack/test/test_packager_formats.py +++ b/python/mozbuild/mozpack/test/test_packager_formats.py @@ -408,8 +408,6 @@ class TestFormatters(unittest.TestCase): self.assertTrue(is_resource(base, 'greprefs.js')) self.assertTrue(is_resource(base, 'hyphenation/foo')) self.assertTrue(is_resource(base, 'update.locale')) - self.assertTrue( - is_resource(base, 'jsloader/resource/gre/modules/foo.jsm')) self.assertFalse(is_resource(base, 'foo')) self.assertFalse(is_resource(base, 'foo/bar/greprefs.js')) self.assertTrue(is_resource(base, 'defaults/messenger/foo.dat')) diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index f2dc3fa..1a1b335 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -30,7 +30,6 @@ from argparse import ArgumentParser import os from StringIO import StringIO import subprocess -import platform import mozinfo # List of libraries to shlibsign. @@ -125,60 +124,6 @@ class LibSignFile(File): errors.fatal('Error while signing %s' % self.path) -def precompile_cache(registry, source_path, gre_path, app_path): - ''' - Create startup cache for the given application directory, using the - given GRE path. - - registry is a FileRegistry-like instance where to add the startup cache. - - source_path is the base path of the package. - - gre_path is the GRE path, relative to source_path. - - app_path is the application path, relative to source_path. - Startup cache for all resources under resource://app/ are generated, - except when gre_path == app_path, in which case it's under - resource://gre/. - ''' - from tempfile import mkstemp - source_path = os.path.abspath(source_path) - if app_path != gre_path: - resource = 'app' - else: - resource = 'gre' - app_path = os.path.join(source_path, app_path) - gre_path = os.path.join(source_path, gre_path) - - fd, cache = mkstemp('.zip') - os.close(fd) - os.remove(cache) - - try: - extra_env = {'MOZ_STARTUP_CACHE': cache} - if buildconfig.substs.get('MOZ_TSAN'): - extra_env['TSAN_OPTIONS'] = 'report_bugs=0' - if buildconfig.substs.get('MOZ_ASAN'): - extra_env['ASAN_OPTIONS'] = 'detect_leaks=0' - if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path, - '-f', os.path.join(os.path.dirname(__file__), - 'precompile_cache.js'), - '-e', 'precompile_startupcache("resource://%s/");' - % resource], - extra_linker_path=gre_path, - extra_env=extra_env): - errors.fatal('Error while running startup cache precompilation') - return - from mozpack.mozjar import JarReader - jar = JarReader(cache) - resource = '/resource/%s/' % resource - for f in jar: - if resource in f.filename: - path = f.filename[f.filename.index(resource) + len(resource):] - if registry.contains(path): - registry.add(f.filename, GeneratedFile(f.read())) - jar.close() - finally: - if os.path.exists(cache): - os.remove(cache) - - class RemovedFiles(GeneratedFile): ''' File class for removed-files. Is used as a preprocessor parser. @@ -389,25 +334,6 @@ def main(): if key in log: f.preload(log[key]) - # Fill startup cache - if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \ - and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1': - gre_path = None - def get_bases(): - for b in sink.packager.get_bases(addons=False): - for p in (mozpath.join('bin', b), b): - if os.path.exists(os.path.join(args.source, p)): - yield p - break - for base in sorted(get_bases()): - if not gre_path: - gre_path = base - omnijar_path = mozpath.join(sink.normalize_path(base), - buildconfig.substs['OMNIJAR_NAME']) - if formatter.contains(omnijar_path): - precompile_cache(formatter.copier[omnijar_path], - args.source, gre_path, base) - copier.copy(args.destination)

1 0