# HG changeset patch
# User Todd Larsen <tlarsen@google.com>
# Date 1213114231 0
# Node ID 43df6d7be888d467933a1b3f152324861d7ca60e
# Parent  7b69140180446ba4e575c5906591e76e333d0cfb
Changes to address Sverre's comments about the previous commit.

Patch by: Todd Larsen
Review by: Sverre Rabbelier
Review issue: 321
Review URL: http://codereviews.googleopensourceprograms.com/321

diff -r 7b6914018044 -r 43df6d7be888 scripts/export_image.py
--- a/scripts/export_image.py	Tue Jun 10 16:08:15 2008 +0000
+++ b/scripts/export_image.py	Tue Jun 10 16:10:31 2008 +0000
@@ -39,18 +39,19 @@
 from trunk.scripts import svn_helper
 
 
-def buildOptionList(defaults):
+def buildOptionList(defaults={}):
   """Returns a list of command-line settings.Options for this script.
 
   Args:
-    defaults: dict of possible pre-loaded default values (may be empty)
+    defaults: dict of possible pre-loaded default values; default is empty
+      dict (which is safe because it is not altered)
   """
   def_repo = defaults.get('repo')
 
   if def_repo:
     repo_help_msg = 'SVN repository; default is %s' % def_repo
   else:
-    repo_help_msg = 'SVN repository; REQUIRED if default unavailable'
+    repo_help_msg = 'SVN repository; REQUIRED if a default is missing'
 
   return [
       settings.Option(
@@ -69,9 +70,11 @@
 
 
 def main(args):
+  # create parser just for usage info before settings file is read successfully
+  usage_parser = settings.OptionParser(option_list=buildOptionList())
+
   # attempt to read the common trunk/scripts settings file
-  defaults = settings.readPythonSettingsOrDie(
-      parser=settings.OptionParser(option_list=buildOptionList({})))
+  defaults = settings.readPythonSettingsOrDie(parser=usage_parser)
 
   # create the command-line options parser
   parser = settings.makeOptionParserOrDie(
@@ -90,14 +93,15 @@
 
   setup_errors = []
 
-  # dirname() called twice because image always ends with os.sep
-  parent_dir = os.path.dirname(os.path.dirname(image))
-
-  if os.path.isdir(image):
+  if os.path.exists(image):
     setup_errors.extend(
         ['--image destination directory must not already exist:',
          '  %s' % image])
 
+  # dirname() called twice because image always ends with os.sep as a result
+  # of svn_helper.getExpandedWorkingCopyPath()
+  parent_dir = os.path.dirname(os.path.dirname(image))
+
   if not os.path.isdir(parent_dir):
     try:
       os.makedirs(parent_dir)