From 22e0bd2b91ff0b55ec57e461f0cd776801ff5d88 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Jan 2008 07:07:53 +0000
Subject: [PATCH] Fix annoying device scanner traceback on shutdown

---
 src/libprs500/devices/scanner.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libprs500/devices/scanner.py b/src/libprs500/devices/scanner.py
index 9dfc211a28..d8ad3b6678 100644
--- a/src/libprs500/devices/scanner.py
+++ b/src/libprs500/devices/scanner.py
@@ -55,13 +55,11 @@ class DeviceScanner(object):
         return linux_scanner()
     
     def scan(self):
-        try: # Windows WMI occassionally and temporarily barfs
+        try: # Windows WMI occasionally and temporarily barfs
             self.devices = self.get_devices()
         except Exception, e:
-            if not iswindows:
+            if not iswindows and e:
                 raise e
-            import traceback
-            traceback.print_exc()
             
         
     def is_device_connected(self, device):