From: Dieter Verfaillie <dieterv@optionexplicit.be>
Date: Mon, 12 Nov 2012 16:18:41 +0000 (+0100)
Subject: giscanner: unbreak g-ir-annotationtool...
X-Git-Tag: GOBJECT_INTROSPECTION_1_35_2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abc95859d05edc9d167ef967652327091422b682;p=platform%2Fupstream%2Fgobject-introspection.git

giscanner: unbreak g-ir-annotationtool...

... and by extension misc/update-glib-annotations.py.

Commit 5c70ef2eb32949f8889e9ae654d50bfbf838951f broke
these by assuming create_source_scanner() is always
called with 'options' and 'args' built by the
OptionParser() defined in scannermain.py's
_get_option_parser().

This is not the case with g-ir-annotationtool, where
annotationmain.py's annotation_main() creates it's
own OptionParser() accepting a different set of
'options' and 'args' as compared to scannermain.py
---

diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 6efd291..45dcbcb 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -348,7 +348,7 @@ def create_binary(transformer, options, args):
     return shlibs
 
 def create_source_scanner(options, args):
-    if options.filelist:
+    if hasattr(options, 'filelist') and options.filelist:
         filenames = extract_filelist(options)
     else:
         filenames = extract_filenames(args)
@@ -408,7 +408,7 @@ def scanner_main(args):
     if options.test_codegen:
         return test_codegen(options.test_codegen)
 
-    if not options.filelist:
+    if hasattr(options, 'filelist') and not options.filelist:
         if len(args) <= 1:
             _error('Need at least one filename')