* Show some messages when pygtk or twisted is missing for the execution of the python...

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@237 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index 7504349cfa7f954f154568a43e6c83ab0735d725..72f8e44981b945c0242ed4020771713721b621d0 100755 (executable)
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-utils/avahi-bookmarks.in
@@ -19,18 +19,27 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import avahi, dbus, gobject, sys
+import sys
 
-from twisted.internet import gtk2reactor
-gtk2reactor.install()
-from twisted.internet import reactor
-from twisted.web import server, resource
+try:
+    import avahi, gobject, dbus
+except ImportError:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+    sys.exit(1)
 
 try:
     import dbus.glib
-except ImportError, e:
+except ImportError:
     pass
 
+try:
+    from twisted.internet import gtk2reactor
+    gtk2reactor.install()
+    from twisted.internet import reactor
+    from twisted.web import server, resource
+except ImportError:
+    print "Sorry, to use this tool you need to install twisted."
+    sys.exit(1)
 
 class AvahiBookmarks(resource.Resource):
     isLeaf = True

diff --git a/avahi-utils/avahi-discover.in b/avahi-utils/avahi-discover.in
index fc1b4765cc53f15f7fdf18d26106dc440cc4d0cf..6c78c51ef7bde047fcbf20423a7c6728f3ce08f9 100755 (executable)
--- a/avahi-utils/avahi-discover.in
+++ b/avahi-utils/avahi-discover.in
@@ -19,12 +19,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import os
-import gtk
-import gobject
+import os, sys
 
-import avahi, dbus, gobject, sys
-from avahi.SimpleGladeApp import SimpleGladeApp
+try:
+    import avahi, gtk, gobject, dbus
+    from avahi.SimpleGladeApp import SimpleGladeApp
+except ImportError:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+    sys.exit(1)
 
 try:
     import dbus.glib
@@ -34,7 +36,6 @@ except ImportError, e:
 service_type_browsers = {}
 service_browsers = {}
 
-
 glade_dir = "@interfacesdir@"
 
 class Main_window(SimpleGladeApp):

diff --git a/avahi-utils/avahi-dump-all.in b/avahi-utils/avahi-dump-all.in
index c3c56b70f664e95962f30abf8dacaa9c57f983b0..c90e964aa9ff65edf4e9c8de41a157b66ce863ad 100755 (executable)
--- a/avahi-utils/avahi-dump-all.in
+++ b/avahi-utils/avahi-dump-all.in
@@ -19,7 +19,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import avahi, dbus, gobject, sys
+import sys
+
+try:
+    import avahi, gobject, dbus
+except ImportError:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+    sys.exit(1)
 
 try:
     import dbus.glib

diff --git a/avahi-utils/avahi-publish-address.in b/avahi-utils/avahi-publish-address.in
index 1942a69f7f7aa1360b6cb5643d2a1ccdead1c7e1..2806049fa7c7f899677617977a004f2007a3168a 100755 (executable)
--- a/avahi-utils/avahi-publish-address.in
+++ b/avahi-utils/avahi-publish-address.in
@@ -19,7 +19,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import avahi, dbus, gobject, sys, getopt, string
+import sys, getopt, string
+
+try:
+    import avahi, gobject, dbus
+except ImportError:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+    sys.exit(1)
 
 try:
     import dbus.glib

diff --git a/avahi-utils/avahi-publish-service.in b/avahi-utils/avahi-publish-service.in
index de259574f0eedbe2a66d4e9e19eeff8c54811d91..89c1566195dd875bf527fce7c014042039209656 100755 (executable)
--- a/avahi-utils/avahi-publish-service.in
+++ b/avahi-utils/avahi-publish-service.in
@@ -19,7 +19,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import avahi, dbus, gobject, sys, getopt
+import sys, getopt
+
+try:
+    import avahi, gobject, dbus
+except ImportError:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+    sys.exit(1)
 
 try:
     import dbus.glib