[diffoscope] 01/01: rdata: rm cmdline indents, looks nicer in output; add Rscript to external-tools

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository diffoscope.

commit 04e39d7cb5dc2a3f9f48823bd36e531ee8428b32
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Apr 20 21:39:55 2017 +0200

    rdata: rm cmdline indents, looks nicer in output; add Rscript to external-tools
---
 diffoscope/comparators/rdata.py | 9 +--------
 diffoscope/external_tools.py    | 3 +++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/diffoscope/comparators/rdata.py b/diffoscope/comparators/rdata.py
index be310e4..8e7ba33 100644
--- a/diffoscope/comparators/rdata.py
+++ b/diffoscope/comparators/rdata.py
@@ -31,14 +31,7 @@ import os.path
 HEADER = binascii.a2b_hex("580a000000020003")
 
 # has to be one line
-DUMP_RDB = """lazyLoad(commandArgs(TRUE));\
-for (obj in ls()) {\
-    print(obj);\
-    for (line in deparse(get(obj))) {\
-        cat(line,"\\n")\
-    }\
-}\
-"""
+DUMP_RDB = """lazyLoad(commandArgs(TRUE)); for (obj in ls()) { print(obj); for (line in deparse(get(obj))) cat(line,"\\n"); }"""
 # unfortunately this above snippet can't detect the build-path differences so
 # diffoscope still falls back to a hexdump
 
diff --git a/diffoscope/external_tools.py b/diffoscope/external_tools.py
index cb40989..3ce2cbd 100644
--- a/diffoscope/external_tools.py
+++ b/diffoscope/external_tools.py
@@ -185,6 +185,9 @@ EXTERNAL_TOOLS = {
         'arch': 'rpmextract',
         'FreeBSD': 'rpm2cpio',
     },
+    'Rscript': {
+        'debian': 'r-base-core',
+    },
     'showttf': {
         'debian': 'fontforge-extras',
     },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git