diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-12-22 16:19:18 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 15:41:31 +0000 |
| commit | b2696869c1428e8ef2a198d2432121ddc2e2034c (patch) | |
| tree | fbcf1588fd09c3d1d19ae93cbf4d30ee13b1f689 | |
| parent | 696979ef39fbd85fa74cfb4a0cbee49b045e2d92 (diff) | |
| download | openembedded-core-contrib-b2696869c1428e8ef2a198d2432121ddc2e2034c.tar.gz | |
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.
(From OE-Core master rev: 9763c1b83362f8445ed6dff2804dd7d282861f79)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/devtool/sdk.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index 7a842afc24..84b9f32a57 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py @@ -85,13 +85,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) |