Merge branch '0.6.x' into 'master'

VIDA-NYU · May 6, 2015 · 1d70146 · 1d70146
2 parents ea65efb + 4269f88
commit 1d70146
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Bugfixes:
 * Fixes invalid escaping in VisTrails XML workflow
 * Fixes docker run failing to read Docker's JSON output on Python 3
 * Fixes mounting too many filesystems in chroot
+* Fixes typo stopping reprounzip from running on unsupported distribs
 
 Features:
 * Adds Debian 8 'Jessie' to Vagrant boxes & Docker images

diff --git a/reprounzip-vagrant/reprounzip/unpackers/vagrant/__init__.py b/reprounzip-vagrant/reprounzip/unpackers/vagrant/__init__.py
@@ -290,8 +290,11 @@ def vagrant_setup_create(args):
             # FIXME : for some reason we need reversed() here, I'm not sure
             # why. Need to read more of tar's docs.
             # TAR bug: --no-overwrite-dir removes --keep-old-files
+            # TAR bug: there is no way to make --keep-old-files not report an
+            # error if an existing file is encountered. --skip-old-files was
+            # introduced too recently. Instead, we just ignore the exit status
             fp.write('tar zpxf /vagrant/experiment.rpz --keep-old-files '
-                     '--numeric-owner --strip=1 %s\n' %
+                     '--numeric-owner --strip=1 %s || /bin/true\n' %
                      ' '.join(shell_escape(p) for p in reversed(pathlist)))
 
         # Copies /bin/sh + dependencies

diff --git a/reprounzip/reprounzip/unpackers/common/packages.py b/reprounzip/reprounzip/unpackers/common/packages.py
@@ -106,9 +106,9 @@ def select_installer(pack, runs, target_distribution=THIS_DISTRIBUTION):
                                 "--distribution")
     elif orig_distribution != target_distribution:
         raise CantFindInstaller(
-                "Installing on %s but pack was generated on %s",
-                target_distribution.capitalize(),
-                orig_distribution.capitalize())
+                "Installing on %s but pack was generated on %s" % (
+                    target_distribution.capitalize(),
+                    orig_distribution.capitalize()))
 
     # Selects installation method
     if target_distribution == 'ubuntu':
@@ -118,7 +118,7 @@ def select_installer(pack, runs, target_distribution=THIS_DISTRIBUTION):
         installer = AptInstaller('apt-get')
     else:
         raise CantFindInstaller(
-                "This distribution, \"%s\", is not supported",
+                "This distribution, \"%s\", is not supported" %
                 target_distribution.capitalize())
 
     return installer
diff --git a/reprounzip/reprounzip/unpackers/common/x11.py b/reprounzip/reprounzip/unpackers/common/x11.py
@@ -252,7 +252,7 @@ def sort_families(gai, order={socket.AF_INET: 0, socket.AF_INET6: 1}):
                     continue
                 if (family, sockaddr[0]) in local_addresses:
                     local_possible = True
-                possible.append(family, sockaddr[0])
+                possible.append((family, sockaddr[0]))
             if local_possible:
                 possible = [(Xauth.FAMILY_LOCAL,
                              '/tmp/.X11-unix/X%d' % local_display)] + possible

diff --git a/reprounzip/reprounzip/unpackers/default.py b/reprounzip/reprounzip/unpackers/default.py
@@ -839,7 +839,7 @@ def setup_directory(parser, **kwargs):
                             help="Command line to run")
     parser_run.add_argument('--enable-x11', action='store_true', default=False,
                             dest='x11',
-                            help=("Enable X11 support (needs an X server)"))
+                            help="Enable X11 support (needs an X server)")
     parser_run.set_defaults(func=directory_run)
 
     # download