Attachment 879838 Details for Bug 849917 – proposed patch

[patch] proposed patch

qpid-config.patch (text/plain), 3.78 KB, created by Petr Matousek on 2014-03-28 13:47:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Matousek

Created: 2014-03-28 13:47:51 UTC

Size: 3.78 KB

patch

obsolete

>--- qpid-config	2014-03-07 13:56:43.000000000 -0500
>+++ qpid-config_patched.py	2014-03-28 10:33:54.101000252 -0400
>@@ -355,7 +355,7 @@
> #
> def snarf_xquery_args():
>     if not config._file:
>-        print "Invalid args to bind xml:  need an input file or stdin"
>+        print >> sys.stderr, "Invalid args to bind xml:  need an input file or stdin"
>         return [False]
>     if config._file == "-":
>         res = sys.stdin.read()
>@@ -371,7 +371,7 @@
> def snarf_header_args(args):
> 
>     if len(args) < 2:
>-        print "Invalid args to bind headers:  need 'any'/'all' plus conditions"
>+        print >> sys.stderr, "Invalid args to bind headers:  need 'any'/'all' plus conditions"
>         return [False]
>     op = args[0]
>     if op == "all" or op == "any":
>@@ -381,7 +381,7 @@
>             kv[k_and_v[0]] = k_and_v[1]
>         return [True, op, kv]
>     else:
>-        print "Invalid condition arg to bind headers, need 'any' or 'all', not '" + op + "'"
>+        print >> sys.stderr, "Invalid condition arg to bind headers, need 'any' or 'all', not '" + op + "'"
>         return [False]
> 
> class BrokerManager:
>@@ -406,7 +406,7 @@
>                      # exception will be printed to stdout
>                      pass
>                  else:
>-                     # raise last exception so complete 
>+                     # raise last exception so complete
>                      # trackback is preserved
>                      raise
> 
>@@ -598,7 +598,7 @@
>             declArgs[r[0]] = value
> 
>         if config._durable:
>-            # allow the default fileCount and fileSize specified 
>+            # allow the default fileCount and fileSize specified
>             # in qpid config file to take prededence
>             if config._fileCount:
>                 declArgs[FILECOUNT] = config._fileCount
>@@ -655,7 +655,7 @@
>             Usage()
>         qname = args[0]
>         self.broker.delQueue(qname, if_empty=config._if_empty, if_unused=config._if_unused)
>- 
>+
> 
> 
>     def Bind(self, args):
>@@ -708,7 +708,7 @@
>             self.broker.reloadAclFile()
>         except Exception, e:
>             if str(e).find('No object found') != -1:
>-                print "Failed: ACL Module Not Loaded in Broker"
>+                print >> sys.stderr, "Failed: ACL Module Not Loaded in Broker"
>             else:
>                 raise
> 
>@@ -802,7 +802,7 @@
>                 desired = []
>                 if len(config._list_properties):
>                     for p in config._list_properties:
>-                        if p not in attributes: print "Warning: No such property '%s' for type '%s'" % (p, modifier)
>+                        if p not in attributes: print >> sys.stderr, "Warning: No such property '%s' for type '%s'" % (p, modifier)
>                         else: desired.append(p)
>                 elif modifier in DEFAULT_PROPERTIES:
>                     desired = DEFAULT_PROPERTIES[modifier]
>@@ -818,9 +818,9 @@
>             else:
>                 Usage()
>     except KeyboardInterrupt:
>-        print
>+        print >> sys.stderr
>     except IOError, e:
>-        print e
>+        print >> sys.stderr, e
>         bm.Disconnect()
>         return 1
>     except SystemExit, e:
>@@ -829,7 +829,7 @@
>     except Exception,e:
>         if e.__class__.__name__ != "Timeout":
>             # ignore Timeout exception, handle in the loop below
>-            print "Failed: %s: %s" % (e.__class__.__name__, e)
>+            print >> sys.stderr, "Failed: %s: %s" % (e.__class__.__name__, e)
>             bm.Disconnect()
>             return 1
> 
>@@ -841,7 +841,7 @@
>             break
>         except Exception, e:
>             if e.__class__.__name__ != "Timeout":
>-                print "Failed: %s: %s" % (e.__class__.__name__, e)
>+                print >> sys.stderr, "Failed: %s: %s" % (e.__class__.__name__, e)
>                 return 1
>     return config._returnCode
>

Flags:

eallen: review-

Actions: View | Diff

Attachments on bug 849917: 879838