From 46a249eaa1db7d0f5b765cff701bb13005e3db49 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@chiradeep-lt2>
Date: Tue, 4 Jan 2011 16:06:03 -0800
Subject: Revert some unneeded formatting since twistd is no longer used

---
 nova/twistd.py      | 6 ++----
 nova/virt/images.py | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nova/twistd.py b/nova/twistd.py
index 1dd10dbb5..29be9c4e1 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -240,16 +240,14 @@ def serve(filename):
     if not FLAGS.pidfile:
         FLAGS.pidfile = '%s.pid' % name
     elif FLAGS.pidfile.endswith('twistd.pid'):
-        FLAGS.pidfile = FLAGS.pidfile.replace('twistd.pid',
-                                              '%s.pid' % name)
+        FLAGS.pidfile = FLAGS.pidfile.replace('twistd.pid', '%s.pid' % name)
     # NOTE(vish): if we're running nodaemon, redirect the log to stdout
     if FLAGS.nodaemon and not FLAGS.logfile:
         FLAGS.logfile = "-"
     if not FLAGS.logfile:
         FLAGS.logfile = '%s.log' % name
     elif FLAGS.logfile.endswith('twistd.log'):
-        FLAGS.logfile = FLAGS.logfile.replace('twistd.log',
-                                              '%s.log' % name)
+        FLAGS.logfile = FLAGS.logfile.replace('twistd.log', '%s.log' % name)
     if FLAGS.logdir:
         FLAGS.logfile = os.path.join(FLAGS.logdir, FLAGS.logfile)
     if not FLAGS.prefix:
diff --git a/nova/virt/images.py b/nova/virt/images.py
index be162b5b1..2d03da4b4 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -70,6 +70,7 @@ def _fetch_image_no_curl(url, path, headers):
 
 def _fetch_s3_image(image, path, user, project):
     url = image_url(image)
+
     # This should probably move somewhere else, like e.g. a download_as
     # method on User objects and at the same time get rewritten to use
     # a web client.
-- 
cgit