diff options
| author | Import-from-archive <[email protected]> | 2017-12-19 13:34:40 -0500 |
|---|---|---|
| committer | Scott Moser <[email protected]> | 2017-12-19 13:34:40 -0500 |
| commit | b7d064e48ad2164b5e120f0044f0bb35f1b64517 (patch) | |
| tree | 8fbddb517b16b1c589e4bd10d972b85e9826c725 | |
| parent | 153865be0cfdb9f1a406c02080fd61195a93d691 (diff) | |
Import version 0.1.0~bzr425-0ubuntu1~16.04.1ubuntu/0.1.0_bzr425-0ubuntu1_16.04.1
| -rw-r--r-- | debian/changelog | 42 | ||||
| -rwxr-xr-x | debian/new-upstream-snapshot | 56 |
2 files changed, 97 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4592caea..699fc863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +curtin (0.1.0~bzr425-0ubuntu1~16.04.1) xenial-proposed; urgency=medium + + [ Scott Moser ] + * debian/new-upstream-snapshot: add writing of debian changelog entries. + + [ Ryan Harper ] + * New upstream snapshot. + - unittest,tox.ini: catch and fix issue with trusty-level mock of open + - block/mdadm: add option to ignore mdadm_assemble errors (LP: #1618429) + - curtin/doc: overhaul curtin documentation for readthedocs.org + (LP: #1351085) + - curtin.util: re-add support for RunInChroot (LP: #1617375) + - curtin/net: overhaul of eni rendering to handle mixed ipv4/ipv6 configs + - curtin.block: refactor clear_holders logic into block.clear_holders and + cli cmd + - curtin.apply_net should exit non-zero upon exception. (LP: #1615780) + - apt: fix bug in disable_suites if sources.list line is blank. + - vmtests: disable Wily in vmtests + - Fix the unittests for test_apt_source. + - get CURTIN_VMTEST_PARALLEL shown correctly in jenkins-runner output + - fix vmtest check_file_strippedline to strip lines before comparing + - fix whitespace damage in tests/vmtests/__init__.py + - fix dpkg-reconfigure when debconf_selections was provided. + (LP: #1609614) + - fix apt tests on non-intel arch + - Add apt features to curtin. (LP: #1574113) + - vmtest: easier use of parallel and controlling timeouts + - mkfs.vfat: add force flag for formating whole disks (LP: #1597923) + - block.mkfs: fix sectorsize flag (LP: #1597522) + - block_meta: cleanup use of sys_block_path and handle cciss knames + (LP: #1562249) + - block.get_blockdev_sector_size: handle _lsblock multi result return + (LP: #1598310) + - util: add target (chroot) support to subp, add target_path helper. + - block_meta: fallback to parted if blkid does not produce output + (LP: #1524031) + - commands.block_wipe: correct default wipe mode to 'superblock' + - tox.ini: run coverage normally rather than separately + - move uefi boot knowledge from launch and vmtest to xkvm + + -- Ryan Harper <[email protected]> Mon, 03 Oct 2016 13:43:54 -0500 + curtin (0.1.0~bzr399-0ubuntu1~16.04.1) xenial-proposed; urgency=medium * debian/new-upstream-snapshot: fix for specifying revision. diff --git a/debian/new-upstream-snapshot b/debian/new-upstream-snapshot index 11fc99f8..bfe9b196 100755 --- a/debian/new-upstream-snapshot +++ b/debian/new-upstream-snapshot @@ -20,6 +20,58 @@ EOF } fail() { echo "$@" 1>&2; exit 1; } +print_commit() { + local subject="$1" author="$2" bugs="$3" aname="" + aname=${author% <*} + echo " - $subject ${aname:+[${aname}]}${bugs:+ (LP: ${bugs})}" +} + +# unfortunately seems like no easy way to get 'Author' unless +# the committer sets it on the commit. And since curtin is doing +# bzr merge and letting committer merge it, then author doesn't +# end up correct on most commits. +# +# log messages look like: +#revno: 424 [merge] +#fixes bug: https://launchpad.net/bugs/1618429 +#committer: Ryan Harper <[email protected]> +#branch nick: merge-wesley-lp1618429 +#timestamp: Thu 2016-09-15 08:48:13 -0500 +#message: +# block/mdadm: add option to ignore mdadm_assemble errors +# +# When wiping disks with mdadm partitions we may encounter unexpected +# return codes. In the case of wiping disks, we don't care if we +# observe any error so allow wipe to ignore the errors by explicitly +# passing in ignore errors. +bzr_log_to_dch() { + local line="" commit="" lcommit="" bugs="" bug="" + while :; do + read line || break + case "$line" in + revno:\ *) + if [ -n "$commit" ]; then + print_commit "$subject" "$author" "$bugs" + fi + commit=${line#*: } + bugs="" + author="" + subject="" + ;; + Author:*) author="${line#Author: }";; + fixes\ bug:*) + # fixes bug: https://launchpad.net/bugs/1618429 + bug="#${line##*/}" + bugs="${bugs:+${bugs}, }${bug}";; + message:) + read subject;; + esac + done + if [ -n "$commit" ]; then + print_commit "$subject" "$author" "$bugs" + fi +} + [ $# -eq 0 ] && { Usage 1>&2; exit 1; } [ "$1" = "-h" -o "$1" = "--help" ] && { Usage; exit 0; } trunk=$1 @@ -53,6 +105,7 @@ bzr merge-upstream "$tarball" "--version=${version}" || oldrev=$(($prevno+1)) ( cd "$trunk" && bzr log -r "${oldrev}..${revno}" ) > new-changes.log || fail "failed to get changes from ${oldrev}..$revno" +bzr_log_to_dch < new-changes.log > new-dch.log cat <<EOF ==== @@ -60,7 +113,8 @@ Now see ./new-changes.log for changes between $oldrev and $revno then: $ dch --edit - # read changes in new-changes.log and write changelog + # read changes in new-dch.log or full changes in new-changes.log + # and write changelog $ debcommit $ dch --release $ debcommit --release |