Mercurial > pidgin.yaz

diff libpurple/purple-url-handler @ 23072:4b4be7609072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import a patch (with changes) from Debian: * 20_purple-remote_friendly.patch: - Make error messages friendlier when python-dbus is not installed or if someone calls purple-remote/purple-url-handler with --help or -h (Closes: #413204) committer: Richard Laager <rlaager@wiktel.com>
author Ari Pollak <ari@debian.org>
date Wed, 21 May 2008 21:05:09 +0000
parents fefe61275687
children 0565c227608d
line wrap: on
line diff
--- a/libpurple/purple-url-handler	Mon May 12 02:03:13 2008 +0000
+++ b/libpurple/purple-url-handler	Wed May 21 21:05:09 2008 +0000
@@ -295,10 +295,14 @@
 
 
 def main(argv=sys.argv):
-    if len(argv) != 2:
+    if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
         print "Usage: %s URI" % argv[0]
         print "Example: %s \"xmpp:romeo@montague.net?message\"" % argv[0]
-        return
+
+        if len(argv) != 2:
+            sys.exit(1)
+        else:
+            return 0
 
     uri = argv[1]
     type = uri.split(":")[0]