Follow-up to bug 1058275 - allow installmozmill.py to accept, but not use, a second argument on branches. rs=jcranmer over irc,a=Standard8
authorMark Banner <standard8@mozilla.com>
Tue, 26 Aug 2014 21:06:52 +0100
changeset 20298 24b4cf6e8762b79aaa2171ccfe3cb7a19b6f3e9e
parent 20295 5888f603ab38e3784b12836131381afec80ca6f3
child 20299 b49ed7b29adf671e2311885864fd220aaf7165a4
push id1203
push usermbanner@mozilla.com
push dateWed, 27 Aug 2014 09:10:03 +0000
treeherdercomm-beta@24b4cf6e8762 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, Standard8
bugs1058275
Follow-up to bug 1058275 - allow installmozmill.py to accept, but not use, a second argument on branches. rs=jcranmer over irc,a=Standard8
mail/test/resources/installmozmill.py
--- a/mail/test/resources/installmozmill.py
+++ b/mail/test/resources/installmozmill.py
@@ -53,17 +53,17 @@ def main(args=None):
   print 'Python: %s' % sys.version
 
   # The data is kept in the same directory as the script
   source=os.path.abspath(os.path.dirname(__file__))
 
   # directory to install to
   if not len(args):
     destination = source
-  elif len(args) == 1:
+  elif len(args) == 1 or len(args) == 2:
     destination = os.path.abspath(args[0])
   else:
     print "Usage: %s [destination]" % sys.argv[0]
     sys.exit(1)
 
   os.chdir(source)
 
   # check for existence of necessary files