diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2015-03-27 14:53:10 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-29 23:07:18 +0100 |
commit | f8cdbe749755dc769150d3a6c2c54318c80e1562 (patch) | |
tree | 6e2ea84ea11c2d63fdcc861bb1e3d2c70de5fce9 /scripts/lib/wic/utils/cmdln.py | |
parent | 35cd410bd3cfcd072df29e36cfe66b2c14cd3841 (diff) | |
download | openembedded-core-f8cdbe749755dc769150d3a6c2c54318c80e1562.tar.gz openembedded-core-f8cdbe749755dc769150d3a6c2c54318c80e1562.tar.bz2 openembedded-core-f8cdbe749755dc769150d3a6c2c54318c80e1562.zip |
combo-layer: clean up dest_dir checking
Empty dest_dir is basically undocumented behavior. The sample conf
only mentions using just a dot for the current directory. In practice,
the empty string does not work because of code like this:
def action_splitpatch(conf, args):
...
if dest_dir != ".":
filerange_root = '%s -x "%s/*"' % (filerange_root, dest_dir)
However, the empty string was not explicitly checked for, leading to
strange errors when trying to apply patches:
[12:50:23] Applying: foobar: xyz
fatal: unable to stat newly created file '/foobar': No such file or directory
This patch turns the empty string into an alias for the dot. This seems
more user-friendly than throwing an error. This alias is intentionally
not document in the sample conf, because the dot is clearer and works also
with older copies of combo-layer.
Instead of checking for both all the time and normalizing the path when
needed (as done in some places), rewrite the value in sanity_check()
and then only check for '.'.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/utils/cmdln.py')
0 files changed, 0 insertions, 0 deletions