MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool: sdk-update: fix traceback without update server set

Browse Source 
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 rev: 9763c1b83362f8445ed6dff2804dd7d282861f79)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2015-12-22 16:19:18 +13:00 committed by Richard Purdie
parent 7540550048
commit 2381f4a394
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/lib/devtool/sdk.py
View File

@ -81,13 +81,9 @@ def install_sstate_objects(sstate_objects, src_sdk, dest_sdk):
def sdk_update(args, config, basepath, workspace): def sdk_update(args, config, basepath, workspace):
# Fetch locked-sigs.inc file from remote/local destination # Fetch locked-sigs.inc file from remote/local destination
from ConfigParser import NoSectionError
updateserver = args.updateserver updateserver = args.updateserver
if not updateserver: if not updateserver:
try: updateserver = config.get('SDK', 'updateserver', '')
updateserver = config.get('SDK', 'updateserver', None)
except NoSectionError:
pass
if not updateserver: if not updateserver:
raise DevtoolError("Update server not specified in config file, you must specify it on the command line") raise DevtoolError("Update server not specified in config file, you must specify it on the command line")
logger.debug("updateserver: %s" % args.updateserver) logger.debug("updateserver: %s" % args.updateserver)