proper fix

stamparm · stamparm · commit 983546d6bf56 · 2011-04-30T07:01:21.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1090,18 +1090,20 @@ def __setHTTPUserAgent():
             conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent()))
 
     else:
-        debugMsg  = "loading random HTTP User-Agent header(s) from "
-        debugMsg += "file '%s'" % paths.USER_AGENTS
-        logger.debug(debugMsg)
-
-        try:
-            kb.userAgents = getFileItems(paths.USER_AGENTS)
-        except IOError:
-            warnMsg  = "unable to read HTTP User-Agent header "
-            warnMsg += "file '%s'" % paths.USER_AGENTS
-            logger.warn(warnMsg)
+        if not kb.userAgents:
+            debugMsg  = "loading random HTTP User-Agent header(s) from "
+            debugMsg += "file '%s'" % paths.USER_AGENTS
+            logger.debug(debugMsg)
 
-            conf.httpHeaders.append((HTTPHEADER.USER_AGENT, __defaultHTTPUserAgent()))
+            try:
+                kb.userAgents = getFileItems(paths.USER_AGENTS)
+            except IOError:
+                warnMsg  = "unable to read HTTP User-Agent header "
+                warnMsg += "file '%s'" % paths.USER_AGENTS
+                logger.warn(warnMsg)
+
+                conf.httpHeaders.append((HTTPHEADER.USER_AGENT, __defaultHTTPUserAgent()))
+                return
 
         count = len(kb.userAgents)
 
