~nacc/git-ubuntu:lp1703029

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision 7ebb673587feec4e0d039c323835fd9675cc3337

Andreas Hasenack: Approve on 2017-07-11

Robie Basak: Pending requested 2017-07-11

Diff: 51 lines (+13/-9)

1 file modified

gitubuntu/merge.py (+13/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

10c7f9f... by Nish Aravamudan on 2017-07-11

git ubuntu merge: quiet ancestor check

Use correct tense in logged message. Will be squashed up.

efa0449... by Nish Aravamudan on 2017-07-11

git ubuntu merge: fallback to new/debian if bug-specific tag is not found

It is sensible to pass --bug to `git ubuntu merge finish` even if not passed ot
`git ubuntu merge start`, as it modifies the resulting changelog.

LP: #1703029

b833422... by Robie Basak on 2017-06-30

Open dsc in binary mode for better decoding

Prior to Debian policy 3.8.1.0 (around March 2009), dsc files could be
encoded in anything as no encoding was mandated.

ubuntutools.archive.Dsc already has some support for auto-detection. It
appears to work, but the dsc must be opened in binary mode for this to
work.

This may mutate hashes if any other dscs are decoded differently as a
consequence of this change.

LP: #1700846

0118ac0... by Nish Aravamudan on 2017-06-28

git ubuntu: emit newline after input() prompt

Otherwise, the line doesn't break and it's not clear where the user's input
starts.

a8127b0... by Nish Aravamudan on 2017-06-28

git ubuntu: quieten keyring logging

502dbb3... by Nish Aravamudan on 2017-06-23

gitubuntu/git_repository: correct search for string in file

We were calling open() on an file-like object, which was already open(). Also,
we need to seek to 0 in order to read in the entire file as written.

Fixes: 62550c080 ('GitUbuntuRepository: properly handle missing
debian/changelog')

38c1859... by Nish Aravamudan on 2017-06-23

gitubuntu/git_repository: open temporary file in same mode as named file

94d0f79... by Nish Aravamudan on 2017-06-22

git ubuntu import: leverage raise ... from ... syntax

This provides a bit of a cleaner stacktrace output on errors when we are
propogating/transforming exceptions. Per PEP 3134, this is present in
python 3.0+.

038533a... by Nish Aravamudan on 2017-06-22

git ubuntu import: remove unnecessary try/catch

We are just going to re-raise an exception in the catch, so don't even
bother try/catch'ing it.

Also clean up some style.

b7c23c6... by Nish Aravamudan on 2017-06-21

git ubuntu build: correct search for matching upstream version

The loop only makes sense if the publishing records are in version
order. That is not the case before this change, as they are in published
order and leads to false output (e.g., for sssd).