~nacc/git-ubuntu:lp1741949-unset-SNAP-calling-lxc

Branch merges

Propose for merging

Rejected for merging into git-ubuntu:master

Server Team CI bot: Needs Fixing (continuous-integration) on 2018-01-09

git-ubuntu developers: Pending requested 2018-01-09

Diff: 21 lines (+10/-0)

1 file modified

gitubuntu/build.py (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

8b21c8e... by Nish Aravamudan on 2018-01-09

add launchpad bug reference in comment

769c675... by Nish Aravamudan on 2018-01-09

build: unset SNAP in lxc's env

Ever since lxc gained snap support, it assumed that if SNAP is set in
it's environment that lxc itself was running as a SNAP. This is not
necessarily the case when git-ubuntu itself is a classic snap (and thus
has SNAP set in its environment) but is calling lxc in the host. Unset
SNAP manually on lxc run() calls.

LP: #1741949

967f050... by Robie Basak on 2017-12-05

Merge remote-tracking branch 'paelzer/add-ubuntu-desktop-sniff-packages' into HEAD

52a4b3f... by Nish Aravamudan on 2017-12-04

lint: properly pass arguments to do_lint by keyword

They were passed in the wrong order before.

LP: #1735744.

57ca3bd... by Robie Basak on 2017-11-28

Fix read_timestamps()

This fails hard in the dictionary comprehension over timestamps since it
expects tuples of items instead of a list of keys. Use items() to
correctly provide the former.

f69cbb6... by Robie Basak on 2017-11-27

Correctly append '.new' to filename for rename

FileNotFoundError: [Errno 2] No such file or directory:
'/tmp/import-source-packages-log/.new'

Expected: '/tmp/import-source-packages-log.new'.

This should be a simple append rather than an os.path.join. Sorry I
missed this in my review.

e7002be... by Robie Basak on 2017-11-24

Add quilt env handling tests

f7a28df... by Robie Basak on 2017-11-24

Log applied import error traceback on exception

As we're swallowing the error in a catch-all exception handler here,
it's helpful if we at least log the full exception and traceback.

I've also filed LP 1734349 to see if this could be improved (I'm not
sure).

71d7004... by Robie Basak on 2017-11-24

import_patches_applied_tree: use correct quilt env

When quilt runs, we must use GitUbuntuRepository:quilt_env in order to
make sure that QUILT_* environment variables are set correctly.
Otherwise we rely on the importer runner having the correct quilt
environment set, which may not be the case.

Also see LP 1734137: separately we need to ensure that any /etc/quiltrc
or ~/.quiltrc is ignored correctly, but I'm treating that as a separate
bug as it needs a more significant refactor to wrap all quilt calls. We
should fix that bug before declaring hash stability, but it isn't as
important as this fix as that one is less likely to be a problem in
practice on our production importer.

4a619a1... by Robie Basak on 2017-11-24

Rename quilt_env_from_commit_hash

This implementation is actually more generic. It will accept anything
that is a treeish hex string, so relabel it and its callers
appropriately.