Further cleanup

* README is now relevant * Auth now properly skipped with os-image-url and os-auth-token provided
2012-03-26 23:29:20 -07:00
parent c530de6389
commit 883d22d032
4 changed files with 66 additions and 115 deletions
@@ -153,8 +153,8 @@ class OpenStackImagesShell(object):
            self.do_help(args)
            return 0

-        auth_reqd = (utils.is_authentication_required(args.func) or
-                        not (args.os_auth_token and args.os_image_url))
+        auth_reqd = (utils.is_authentication_required(args.func) and
+                     not (args.os_auth_token and args.os_image_url))

        if not auth_reqd:
            endpoint = args.os_image_url