# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1334002805 25200
# Node ID 33e5d444ff308aa5e56d1f5d1ad46e92a9b7ee4b
# Parent  77285bafc36ac6aba7d1f3616f291662c19c2db3
fix

diff -r 77285bafc36a -r 33e5d444ff30 carton.py
--- a/carton.py	Mon Apr 09 13:17:38 2012 -0700
+++ b/carton.py	Mon Apr 09 13:20:05 2012 -0700
@@ -32,13 +32,13 @@
 """
 
 # imports
+import optparse
 import os
 import sys
 import subprocess
 import tarfile
 import tempfile
 import urllib2
-from optparse import OptionParser
 from StringIO import StringIO
 
 # global variables
@@ -188,7 +188,7 @@
                 return description.strip() + '\n'
             else:
                 return ''
-    parser = OptionParser(usage=usage, description=__doc__)
+    parser = optparse.OptionParser(usage=usage, description=__doc__, formatter=PlainDescriptionFormatter())
     parser.add_option('-o', dest='outfile',
                       help="specify outfile; otherwise it will come from environment_name")
     parser.add_option('-p', '--package', dest='package',