From 2759a248785152916d9f89ec94face5e5db9a83c Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 3 Dec 2014 17:28:30 +0000
Subject: Fix % interpolation crash

Previously if we got a BaserockImportException which contained a '%' in
the message, you'd see this...

    Traceback (most recent call last):
      File "/usr/lib/python2.7/site-packages/cliapp/app.py", line 190, in
    _run
        self.process_args(args)
      File "/src/import/baserockimport/app.py", line 102, in process_args
        super(BaserockImportApplication, self).process_args(args)
      File "/usr/lib/python2.7/site-packages/cliapp/app.py", line 539, in
    process_args
        method(args[1:])
      File "/src/import/baserockimport/app.py", line 185, in import_rubygems
        loop.run()
      File "/src/import/baserockimport/mainloop.py", line 176, in run
        self.app.status(str(e), error=True)
      File "/src/import/baserockimport/app.py", line 105, in status
        text = msg % args
    TypeError: not enough arguments for format string
---
 baserockimport/mainloop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py
index 36a7016..b400695 100644
--- a/baserockimport/mainloop.py
+++ b/baserockimport/mainloop.py
@@ -173,7 +173,7 @@ class ImportLoop(object):
                 self._process_package(current_item)
                 error = False
             except BaserockImportException as e:
-                self.app.status(str(e), error=True)
+                self.app.status('%s', e, error=True)
                 errors[current_item] = e
                 error = True
 
-- 
cgit v1.2.1