Changeset 5516

Timestamp:

10/30/09 09:16:22 (3 weeks ago)

Author:

desai

Message:

bcfg2-info: fix traceback when python-profiler is not available (see Ticket #767 for details)

Location:

trunk/bcfg2

Files:

• debian/changelog (modified) (1 diff)
• src/sbin/bcfg2-info (modified) (4 diffs)

trunk/bcfg2/debian/changelog

@@ -2 +2 @@
 
   * Update packaging
-    * Switch to plain debhelper
-    * Switch from pycentral to python-support
-    * Move homepage to the dedicated Homepage field
-    * Update Standards-Version to 3.8.3.0
+  * Switch to plain debhelper
+  * Switch from pycentral to python-support
+  * Move homepage to the dedicated Homepage field
+  * Update Standards-Version to 3.8.3.0
 
  -- Sami Haahtinen <ressu@debian.org>  Sat, 24 Oct 2009 00:20:51 +0300

trunk/bcfg2/src/sbin/bcfg2-info

@@ -10 +10 @@
 import lxml.etree
 import os
-import profile
-import pstats
 import sys
 import tempfile
+
+try:
+    import profile
+    import pstats
+    have_profile = True
+except:
+    have_profile = False
 
 import Bcfg2.Logger
@@ -411 +416 @@
 
     def do_profile(self, arg):
+        if not have_profile:
+            print("Profiling functionality not available")
+            return
         tracefname = tempfile.mktemp()
         p = profile.Profile()
@@ -437 +445 @@
     setup = Bcfg2.Options.OptionParser(optinfo)
     setup.parse(sys.argv[1:])
-    print(setup)
-    if setup['profile']:
+    if setup['profile'] and have_profile:
         prof = profile.Profile()
         loop = prof.runcall(infoCore, setup['repo'], setup['plugins'],
@@ -445 +452 @@
         displayTrace(prof)
     else:
+        if setup['profile']:
+            print("Profiling functionality not available")
         loop = infoCore(setup['repo'], setup['plugins'], setup['password'],
                         setup['encoding'], setup['event debug'])