diff options
| -rwxr-xr-x | check | 2 | ||||
| -rwxr-xr-x | morphlib/app.py | 7 | ||||
| -rw-r--r-- | morphlib/yamlparse.py | 7 | ||||
| -rwxr-xr-x | scripts/bootstrap | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -2,7 +2,7 @@ # # Run test suite for morph. # -# Copyright (C) 2011, 2012 Codethink Limited +# Copyright (C) 2011-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/morphlib/app.py b/morphlib/app.py index 9239bf31..b2ddfdb1 100755 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Codethink Limited +# Copyright (C) 2011-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -124,8 +124,9 @@ class Morph(cliapp.Application): group=group_build) self.settings.boolean(['no-ccache'], 'do not use ccache', group=group_build) - self.settings.boolean(['no-distcc'], 'do not use distcc', - group=group_build) + self.settings.boolean(['no-distcc'], + 'do not use distcc (default: true)', + group=group_build, default=True) self.settings.string(['prefix'], 'build chunks with prefix PREFIX', metavar='PREFIX', default=defaults['prefix'], diff --git a/morphlib/yamlparse.py b/morphlib/yamlparse.py index a2832b89..7e591b08 100644 --- a/morphlib/yamlparse.py +++ b/morphlib/yamlparse.py @@ -66,7 +66,7 @@ if morphlib.got_yaml: # pragma: no cover except TypeError, exc: raise yaml.constructor.ConstructorError( 'while constructing a mapping', node.start_mark, - 'found unacceptable key (%s)' % exc, + 'found unacceptable key (%s)' % exc, key_node.start_mark) value = self.construct_object(value_node, deep=deep) mapping[key] = value @@ -87,7 +87,7 @@ if morphlib.got_yaml: # pragma: no cover def __init__(self, *args, **kwargs): yaml.Dumper.__init__(self, *args, **kwargs) - # When YAML sees an OrderedDict, use represent_ordered_dict to + # When YAML sees an OrderedDict, use represent_ordered_dict to # dump it self.add_representer(OrderedDict, type(self).represent_ordered_dict) @@ -125,10 +125,9 @@ if morphlib.got_yaml: # pragma: no cover if 'default_flow_style' not in kwargs: kwargs['default_flow_style'] = False return yaml.dump(Dumper=OrderedDictYAMLDumper, *args, **kwargs) - + else: # pragma: no cover def load(*args, **kwargs): raise morphlib.Error('YAML not available') def dump(*args, **kwargs): raise morphlib.Error('YAML not available') - diff --git a/scripts/bootstrap b/scripts/bootstrap index 775307ad..37ce6952 100755 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -236,7 +236,7 @@ build_eglibc() { # Necessary for ARM port. if [ ! -e "$source_dir/libc/ports" ]; then - ln -s "$source_dir/ports $source_dir/libc/ports" + ln -s "$source_dir/ports" "$source_dir/libc/ports" fi cd "$source_dir" |