~lucaskanashiro/git-ubuntu:master

Last commit made on 2021-07-27
Get this branch:
git clone -b master https://git.launchpad.net/~lucaskanashiro/git-ubuntu
Only Lucas Kanashiro can upload to this branch. If you are Lucas Kanashiro please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~lucaskanashiro/git-ubuntu

Recent commits

c31ede8... by Robie Basak

Whitelist Google-related packages for Utkarsh

b15bd6b... by Bryce Harrington

Add several packages to the whitelist.

These packages are listed on Merge-o-Matic as having been last modified
by server team members, and so may be ones team members will want to
continue maintaining in git-ubuntu.

9fdb2d4... by Bryce Harrington

Add python-django-formtools to the whitelist.

7651bfc... by Bryce Harrington

Add python-sqlalchemy-utils to the whitelist.

aeffa86... by Bryce Harrington

Add composer to the whitelist.

e2d854c... by Robie Basak

Merge remote-tracking branch 'bryce/fix_export_orig_empty_tarballs_traceback'

ba53af3... by Bryce Harrington

build: Ensure fetch_orig() always returns a list

When no tarballs can be successfully found by any mechanism,
fetch_orig()'s loop will exit. Since no return statement was provided
in such a case, the function returns None. exportorig.py's main()
routine returns this None directly to the top level, where it is stored
in the variable tarball. This results in a traceback like:

  File "/snap/git-ubuntu/477/usr/lib/python3/dist-packages/gitubuntu/exportorig.py", line 117, in cli_main
    if len(tarballs) > 0:
  TypeError: object of type 'NoneType' has no len()

We don't yet have test cases for build.py, but I added an assert in
fetch_orig() prior to its return to avoid papering over unrelated errors
in mechanisms.

Fixes: https://bugs.launchpad.net/usd-importer/+bug/1868631

1aa8baa... by Robie Basak

Merge branch 'integration-fixes'

24abd00... by Robie Basak

Include all dpkg decompressors in the snap

bzip2/bunzip2 was missing in the snap, which prevented "git ubuntu
import" from working in the case that bzip2 compression was used in
their source packages.

Add an integration test to ensure that all dpkg decompressors are
available, and fix the snap to include them explicitly.

LP: #1928775

5f00e42... by Robie Basak

Test and fix git-ubuntu.reconstruct-changelog

An internal "reconstruct changelog" implementation is used by "git
ubuntu merge". However, the original shell implementation still exists
and is exposed by a separate endpoint. In the recent snap refactoring to
core20, this implementation was broken by the new wrapper failing to
pass through the command line arguments. We fix this, and also add a
test to ensure this doesn't regress.

The test is somewhat involved because there are multiple ways in which
this (and our other endpoints) are invoked, and we want to test them
all. More details in the comments.