diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-11-08 15:15:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-11-08 15:15:07 +0000 |
| commit | bdef734b2bc68ae7c1bdcd456ae1e9dfd9ba6a42 (patch) | |
| tree | a2732818c549e5503c7fd65dc176a5d5333a442f | |
| parent | 691c683ed5f2e0f6697e02720345f2acd7457728 (diff) | |
Don't shift ARGV[0] to undefined. (#466557, Aidan Delaney)
2007-11-08 Matthias Clasen <mclasen@redhat.com>
* glib-mkenums.in: Don't shift ARGV[0] to undefined.
(#466557, Aidan Delaney)
svn path=/branches/glib-2-14/; revision=5828
| -rw-r--r-- | gobject/ChangeLog | 7 | ||||
| -rwxr-xr-x | gobject/glib-mkenums.in | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 405afc1dd..b22f05d02 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,10 @@ +2007-11-08 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk: + + * glib-mkenums.in: Don't shift ARGV[0] to undefined. + (#466557, Aidan Delaney) + 2007-11-07 Matthias Clasen <mclasen@redhat.com> * === Released 2.14.3 === diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in index cabb0f777..e7e00eaf9 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -215,7 +215,7 @@ sub read_template_file { if (!defined $ARGV[0]) { usage; } -while ($_ = $ARGV[0], /^-/) { +while ($_=$ARGV[0],/^-/) { shift; last if /^--$/; if (/^--template$/) { read_template_file (shift); } @@ -230,6 +230,7 @@ while ($_ = $ARGV[0], /^-/) { elsif (/^--help$/ || /^-h$/) { usage; } elsif (/^--version$/ || /^-v$/) { version; } else { usage; } + last if not defined($ARGV[0]); } # put auto-generation comment |