From: Marco Cavallini <m.cavallini@koansoftware.com>
Date: Mon, 14 Feb 2011 09:15:10 +0000 (+0100)
Subject: packaged-staging.bbclass: partial revert of commit fe706bb9af34ce43e8ec55fbf929a85d3b... 
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a97f8c4f99330848b8dbe7e54b3560eceb486c8;p=openembedded.git

packaged-staging.bbclass: partial revert of commit fe706bb9af34ce43e8ec55fbf929a85d3b6d612a due to build error

 * # ERROR: Error in compiling python function in:
 * # ERROR: The lines leading to this error were:
 * # ERROR:  22:SyntaxError:'        except Exception as ex:'
---

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index c514581523..674dcc4d7e 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -200,9 +200,9 @@ def staging_fetch(stagepkg, d):
         try:
             bb.fetch.init([srcuri], pd)
             bb.fetch.go(pd, [srcuri])
-	    bb.debug(1, "Fetched staging package %s" % (bn))
-        except Exception as ex:
-	    bb.debug(1, "Failed to fetch staging package %s: %s" % (bn, ex))
+            bb.debug(1, "Fetched staging package %s" % (bn))
+        except:
+            bb.debug(1, "Failed to fetch staging package %s" % (bn))
             return
 
 PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging"