From 57675eef7bfb510880ca051b2fc6e3d286f575c1 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 16 Apr 2015 14:06:52 -0400 Subject: [PATCH 1/2] Better logging in scrambler, shows more detailed error when, for example, hardlinked items in tars cause errors --- lib/galaxy/eggs/scramble.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/eggs/scramble.py b/lib/galaxy/eggs/scramble.py index 528bb60dd49..4725695d0af 100644 --- a/lib/galaxy/eggs/scramble.py +++ b/lib/galaxy/eggs/scramble.py @@ -150,7 +150,11 @@ class ScrambleEgg( Egg ): cur = os.getcwd() os.chdir( unpack_path ) for member in members: - t.extract( member ) + try: + t.extract( member ) + except: + log.exception("Could not extract %s" % member) + raise t.close() os.rename( tld, self.name ) os.chdir( cur ) From 1c0d694d47ab054bc6aeae23ed53338b1a994d07 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 16 Apr 2015 14:17:04 -0400 Subject: [PATCH 2/2] Swap log string formatting to arg --- lib/galaxy/eggs/scramble.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/eggs/scramble.py b/lib/galaxy/eggs/scramble.py index 4725695d0af..a22ccdc9621 100644 --- a/lib/galaxy/eggs/scramble.py +++ b/lib/galaxy/eggs/scramble.py @@ -153,7 +153,7 @@ class ScrambleEgg( Egg ): try: t.extract( member ) except: - log.exception("Could not extract %s" % member) + log.exception( "Could not extract %s", member ) raise t.close() os.rename( tld, self.name )