Fix WorkingDir class to support already existing target directory.
The WorkingDir class can take a config that defines a target directory.
If that directory already existed, then WorkingDir would raise a
OSError (FileExistsError) when it attempted to os.mkdir.
The fix here just allows a target to exist already as long as it is empty.
Curtin would fail to extract an image if the image was a
local filesystem path or a file:// url.
Also here is a fix for ensure_dir which would be tripped if you
call write_file("foo.txt"). In that path, ensure_dir would be called
with the result of os.path.dirname("foo.txt") which is "" and
os.makedirs("") would fail.
subp: update return value of subp with combine_capture=True.
combine_capture previously would return None in the stderr response.
This was inconsistent with capture=True, combine_capture=False.
It seems more consistent to always return the bytes or string as
documented. Test case and docstring are updated accordingly.
tox: add a xenial environments, default envlist changes.
A previous commit used mock.assert_called, which is not
present in xenial versions of mock so build would fail on xenial.
Due to bugs that are present in the trusty versions of mock it would
pass there.
So we add a tox environment 'xenial-py3' and add that to the
default set of environments that are run with a 'tox' invocation.
Other changes to the envlist here:
a.) make it multiple lines for easier future diffing.
b.) run py3-flake8 first, it runs quickly and gives good feedback.
c.) drop trusty-check which was running trusty pyflakes. We do not
run pyflakes in package build any more.
d.) replace trusty-py3 with xenial-py3. Just to save time in default 'tox'
run we only run one "old" python3 unit tests.
After adding 'CURTIN_EXE_VERSION' and 'CURTIN_VERSION' in output
we now see nice output for runs from trunk. But when running from
a package via curtainer, we see:
CURTIN_VMTEST_CURTIN_EXE=.. curtin-vmtest-proposed-a-29 curtin
CURTIN_VMTEST_CURTIN_EXE_VERSION=18.1-17-gae48e86f-0ubuntu1~17.10.1
CURTIN_VMTEST_CURTIN_VERSION=18.1
That is confusing as it appears our vmtest version is different
from our exe version.
That is because the patching of the version that we do in debian/rules
only applies to the built binaries, the source still has the un-modified
@@PACKAGED_VERSION@@ in tact.
The change here is patch the source code output by --source
by default, so that running 'curtin version' from that source will
provide the correct output. Jenkins is the only known consumer of this
ouput so it was easier to change the default behavior than have the caller
become aware. To disable this behavior pass '--no-patch-version'
Note that curtin has verified that it downloaded the
version of the source that it is patching in, so this is
known-to-be-correct.
