From: Paul Eggleton Date: Tue, 22 Dec 2015 03:19:18 +0000 (+1300) Subject: devtool: sdk-update: fix traceback without update server set X-Git-Tag: 2016-4~1850 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9763c1b83362f8445ed6dff2804dd7d282861f79;p=openembedded-core.git devtool: sdk-update: fix traceback without update server set If the SDK update server hasn't been set in the config (when building the extensible SDK this would be set via SDK_UPDATE_URL) and it wasn't specified on the command line then we were failing with a traceback because we didn't pass the default value properly - None is interpreted as no default, meaning raise an exception if no such option exists. Additionally we don't need the try...except anymore either because with a proper default value, NoSectionError is caught as well. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index 85c0fb1729..f08f0eee7c 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py @@ -81,13 +81,9 @@ def install_sstate_objects(sstate_objects, src_sdk, dest_sdk): def sdk_update(args, config, basepath, workspace): # Fetch locked-sigs.inc file from remote/local destination - from ConfigParser import NoSectionError updateserver = args.updateserver if not updateserver: - try: - updateserver = config.get('SDK', 'updateserver', None) - except NoSectionError: - pass + updateserver = config.get('SDK', 'updateserver', '') if not updateserver: raise DevtoolError("Update server not specified in config file, you must specify it on the command line") logger.debug("updateserver: %s" % args.updateserver)