r928 - in /trunk/packages/vim-addon-manager: debian/changelog src/vim-addons

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Apr 29 09:33:02 2007
New Revision: 928

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=928
Log:
- more graceful handling of command line parsing errors
- ready for an upload to unstable

Modified:
    trunk/packages/vim-addon-manager/debian/changelog
    trunk/packages/vim-addon-manager/src/vim-addons

Modified: trunk/packages/vim-addon-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-addon-manager/debian/changelog?rev=928&op=diff
==============================================================================
--- trunk/packages/vim-addon-manager/debian/changelog (original)
+++ trunk/packages/vim-addon-manager/debian/changelog Sun Apr 29 09:33:02 2007
@@ -1,15 +1,17 @@
-vim-addon-manager (0.2) UNRELEASED; urgency=low
+vim-addon-manager (0.2) unstable; urgency=low
 
+  * uploading to unstable
   * vim-addons:
     - when files are installed or removed under doc/ run helpztags afterwards
       to regenerate help tags
     - avoid performing an action when there is no need to perform it
     - added feedback messages for the user
+    - handle gracefully command line parsing errors (Closes: #420029)
   * debian/control
     - added dependency on vim-common, which ships /usr/bin/helpztags
     - added XS-Vcs-* fields
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 19 Feb 2007 14:35:53 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 29 Apr 2007 11:29:11 +0200
 
 vim-addon-manager (0.1) experimental; urgency=low
 

Modified: trunk/packages/vim-addon-manager/src/vim-addons
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-addon-manager/src/vim-addons?rev=928&op=diff
==============================================================================
--- trunk/packages/vim-addon-manager/src/vim-addons (original)
+++ trunk/packages/vim-addon-manager/src/vim-addons Sun Apr 29 09:33:02 2007
@@ -177,23 +177,27 @@
                    ['--verbose', '-v', GetoptLong::NO_ARGUMENT],
                    ['--system-dir', '-y', GetoptLong::REQUIRED_ARGUMENT],
                    ['--system-wide', '-w', GetoptLong::NO_ARGUMENT])
-  cmdline.each do |opt, arg|
-    case opt
-    when '--help'
-      die_usage
-    when '--registry-dir'
-      options[:registry_dir] = arg
-    when '--source-dir'
-      options[:source_dir] = arg
-    when '--target-dir'
-      options[:target_dir] = arg
-    when '--verbose'
-      Vim.increase_verbosity
-    when '--system-dir'
-      options[:system_dir] = arg
-    when '--system-wide'
-      options[:system_wide] = true
+  begin
+    cmdline.each do |opt, arg|
+      case opt
+      when '--help'
+        die_usage
+      when '--registry-dir'
+        options[:registry_dir] = arg
+      when '--source-dir'
+        options[:source_dir] = arg
+      when '--target-dir'
+        options[:target_dir] = arg
+      when '--verbose'
+        Vim.increase_verbosity
+      when '--system-dir'
+        options[:system_dir] = arg
+      when '--system-wide'
+        options[:system_wide] = true
+      end
     end
+  rescue GetoptLong::Error
+    die_usage
   end
   options[:target_dir] = options[:system_dir] if options[:system_wide]
   die_usage unless cmd = ARGV.shift