From 8435a665b16cba290c20f0c570d30774fbed3b61 Mon Sep 17 00:00:00 2001
From: Ross Poulton <ross@rossp.org>
Date: Wed, 2 Feb 2011 07:49:44 +0000
Subject: [PATCH] Fix to issue #16: escalate_tickets fails with an error due to
 conflicting command-line arguments

---
 helpdesk/management/commands/escalate_tickets.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/helpdesk/management/commands/escalate_tickets.py b/helpdesk/management/commands/escalate_tickets.py
index 33b736ac..6188e81a 100644
--- a/helpdesk/management/commands/escalate_tickets.py
+++ b/helpdesk/management/commands/escalate_tickets.py
@@ -27,10 +27,10 @@ class Command(BaseCommand):
 
         self.option_list += (
             make_option(
-                '--queues', '-q',
+                '--queues',
                 help='Queues to include (default: all). Use queue slugs'),
             make_option(
-                '--verbose', '-v',
+                '--verboseescalation',
                 action='store_true',
                 default=False,
                 help='Display a list of dates excluded'),
@@ -41,7 +41,7 @@ class Command(BaseCommand):
         queue_slugs = None
         queues = []
 
-        if options['verbose']:
+        if options['verboseescalation']:
             verbose = True
         if options['queues']:
             queue_slugs = options['queues']
@@ -158,13 +158,13 @@ def escalate_tickets(queues, verbose):
 
 def usage():
     print "Options:"
-    print " --queues, -q: Queues to include (default: all). Use queue slugs"
-    print " --verbose, -v: Display a list of dates excluded"
+    print " --queues: Queues to include (default: all). Use queue slugs"
+    print " --verboseescalation: Display a list of dates excluded"
 
 
 if __name__ == '__main__':
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'q:v', ['queues=', 'verbose'])
+        opts, args = getopt.getopt(sys.argv[1:], ['queues=', 'verboseescalation'])
     except getopt.GetoptError:
         usage()
         sys.exit(2)
@@ -174,9 +174,9 @@ if __name__ == '__main__':
     queues = []
 
     for o, a in opts:
-        if o in ('-v', '--verbose'):
+        if o == '--verboseescalation':
             verbose = True
-        if o in ('-q', '--queues'):
+        if o == '--queues':
             queue_slugs = a
 
     if queue_slugs is not None: