| 2011-11-22 09:10:33 |
Marcin Juszkiewicz |
bug |
|
|
added bug |
| 2011-11-22 09:24:30 |
Marcin Juszkiewicz |
attachment added |
|
changelog https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/893495/+attachment/2604702/+files/changelog |
|
| 2011-11-22 09:24:43 |
Marcin Juszkiewicz |
attachment added |
|
changelog.THIS https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/893495/+attachment/2604704/+files/changelog.THIS |
|
| 2011-11-22 09:24:57 |
Marcin Juszkiewicz |
attachment added |
|
changelog.BASE https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/893495/+attachment/2604705/+files/changelog.BASE |
|
| 2011-11-22 09:25:08 |
Marcin Juszkiewicz |
attachment added |
|
changelog.OTHER https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/893495/+attachment/2604706/+files/changelog.OTHER |
|
| 2011-11-22 11:03:24 |
Martin Packman |
summary |
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 23: ordinal not in range(128) |
Zero byte successful merge after error from dpkg-mergechangelogs |
|
| 2011-11-22 11:03:24 |
Martin Packman |
description |
I was merging lp:ubuntu/gcc-4.6 into my lp:~hrw/ubuntu/precise/gcc-4.6/cross-fixes branch and as result I got debian/changelog dropped to 0 size:
09:29 hrw@puchatek:gcc-4.6-my-cross-fixes$ bzr merge lp:ubuntu/gcc-4.6
Most recent Ubuntu version: 4.6.2-5ubuntu1
Packaging branch status: CURRENT
Traceback (most recent call last):e merge 1/16
File "/usr/lib/python2.7/logging/__init__.py", line 865, in emit
stream.write(fs % msg.encode("UTF-8"))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 23: ordinal not in range(128)
Logged from file merge_changelog.py, line 73
+N debian/patches/gcc-multilib64-multiarch-trunk.diff
+N debian/patches/gcc-powerpc-nof-trunk.diff
+N debian/patches/libffi-powerpc-sysv-without-string-ops.diff
M debian/changelog
M debian/control
M debian/control.m4
-D debian/patches/arm-unbreak-eabi-armv4t.diff
M debian/patches/armhf-triplet-trunk.diff
M debian/patches/gcc-multiarch.diff
M debian/patches/svn-updates-linaro.diff
M debian/patches/svn-updates.diff
M debian/rules.conf
M debian/rules.defs
M debian/rules.parameters
M debian/rules.patch
M debian/rules2
Text conflict in debian/control.m4
Text conflict in debian/rules2
2 conflicts encountered.
09:54 hrw@puchatek:debian$ bzr diff|diffstat
changelog |10138 --------------------
According to mgz from #bzr bug is in a way how bzr-builddep/merge_changelog.py uses logger. After changing code I got:
10:08 hrw@puchatek:debian$ LC_ALL=C bzr remerge changelog
debian/changelog is not conflicted
dpkg-mergechangelogs: warning: /tmp/tmpiGP5_Sdeb_changelog_merge/changelog.this(l0): found eof where expected first heading
dpkg-mergechangelogs: error: ss-970814-1 is not a valid version
All changes applied successfully.
And changelog file was still empty.
Change was in/usr/share/pyshared/bzrlib/plugins/builddeb/merge_changelog.py file (line 73):
- _logger.warning('%s', stderr)
+ _logger.warning('%s', stderr.decode("utf-8", "replace"))
ProblemType: Bug
DistroRelease: Ubuntu 12.04
Package: bzr-builddeb 2.7.9ubuntu1
ProcVersionSignature: Ubuntu 3.1.0-2.3-generic 3.1.0
Uname: Linux 3.1.0-2-generic x86_64
ApportVersion: 1.26-0ubuntu1
Architecture: amd64
Date: Tue Nov 22 09:52:45 2011
InstallationMedia: Kubuntu 10.04 "Lucid Lynx" - Release Candidate amd64 (20100419.1)
PackageArchitecture: all
SourcePackage: bzr-builddeb
UpgradeStatus: No upgrade log present (probably fresh install) |
I was merging lp:ubuntu/gcc-4.6 into my lp:~hrw/ubuntu/precise/gcc-4.6/cross-fixes branch and as result I got debian/changelog dropped to 0 size:
09:29 hrw@puchatek:gcc-4.6-my-cross-fixes$ bzr merge lp:ubuntu/gcc-4.6
Most recent Ubuntu version: 4.6.2-5ubuntu1
Packaging branch status: CURRENT
Traceback (most recent call last):e merge 1/16
File "/usr/lib/python2.7/logging/__init__.py", line 865, in emit
stream.write(fs % msg.encode("UTF-8"))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 23: ordinal not in range(128)
Logged from file merge_changelog.py, line 73
+N debian/patches/gcc-multilib64-multiarch-trunk.diff
+N debian/patches/gcc-powerpc-nof-trunk.diff
+N debian/patches/libffi-powerpc-sysv-without-string-ops.diff
M debian/changelog
M debian/control
M debian/control.m4
-D debian/patches/arm-unbreak-eabi-armv4t.diff
M debian/patches/armhf-triplet-trunk.diff
M debian/patches/gcc-multiarch.diff
M debian/patches/svn-updates-linaro.diff
M debian/patches/svn-updates.diff
M debian/rules.conf
M debian/rules.defs
M debian/rules.parameters
M debian/rules.patch
M debian/rules2
Text conflict in debian/control.m4
Text conflict in debian/rules2
2 conflicts encountered.
09:54 hrw@puchatek:debian$ bzr diff|diffstat
changelog |10138 --------------------
According to mgz from #bzr bug is in a way how bzr-builddeb/merge_changelog.py uses logger. After changing code I got:
10:08 hrw@puchatek:debian$ LC_ALL=C bzr remerge changelog
debian/changelog is not conflicted
dpkg-mergechangelogs: warning: /tmp/tmpiGP5_Sdeb_changelog_merge/changelog.this(l0): found eof where expected first heading
dpkg-mergechangelogs: error: ss-970814-1 is not a valid version
All changes applied successfully.
And changelog file was still empty.
Change was in/usr/share/pyshared/bzrlib/plugins/builddeb/merge_changelog.py file (line 73):
- _logger.warning('%s', stderr)
+ _logger.warning('%s', stderr.decode("utf-8", "replace"))
ProblemType: Bug
DistroRelease: Ubuntu 12.04
Package: bzr-builddeb 2.7.9ubuntu1
ProcVersionSignature: Ubuntu 3.1.0-2.3-generic 3.1.0
Uname: Linux 3.1.0-2-generic x86_64
ApportVersion: 1.26-0ubuntu1
Architecture: amd64
Date: Tue Nov 22 09:52:45 2011
InstallationMedia: Kubuntu 10.04 "Lucid Lynx" - Release Candidate amd64 (20100419.1)
PackageArchitecture: all
SourcePackage: bzr-builddeb
UpgradeStatus: No upgrade log present (probably fresh install) |
|
| 2011-11-30 10:17:35 |
Rick Spencer |
bzr-builddeb (Ubuntu): status |
New |
Confirmed |
|
| 2011-11-30 10:17:50 |
Rick Spencer |
bzr-builddeb (Ubuntu): importance |
Undecided |
Medium |
|
| 2011-12-13 20:51:08 |
Martin Packman |
bug task added |
|
bzr-builddeb |
|
| 2011-12-13 21:41:48 |
Martin Packman |
bug watch added |
|
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651993 |
|
| 2011-12-13 21:41:48 |
Martin Packman |
bug task added |
|
dpkg |
|
| 2011-12-13 23:21:24 |
Launchpad Janitor |
branch linked |
|
lp:~gz/bzr-builddeb/merge_changelog_invalid_version_893495 |
|
| 2011-12-13 23:25:16 |
Martin Packman |
bzr-builddeb: status |
New |
In Progress |
|
| 2011-12-13 23:25:16 |
Martin Packman |
bzr-builddeb: assignee |
|
Martin Packman (gz) |
|
| 2011-12-15 07:12:54 |
Martin Packman |
bzr-builddeb: status |
In Progress |
Fix Committed |
|
| 2011-12-16 03:12:57 |
Bug Watch Updater |
dpkg: status |
Unknown |
New |
|
| 2011-12-16 20:39:15 |
Jelmer Vernooij |
bzr-builddeb: status |
Fix Committed |
Fix Released |
|
| 2011-12-16 20:39:20 |
Jelmer Vernooij |
bzr-builddeb (Ubuntu): status |
Confirmed |
In Progress |
|
| 2011-12-16 20:39:23 |
Jelmer Vernooij |
bzr-builddeb (Ubuntu): assignee |
|
Jelmer Vernooij (jelmer) |
|
| 2011-12-17 09:37:47 |
Launchpad Janitor |
branch linked |
|
lp:debian/bzr-builddeb |
|
| 2011-12-17 17:47:12 |
Launchpad Janitor |
bzr-builddeb (Ubuntu): status |
In Progress |
Fix Released |
|
| 2011-12-17 18:09:26 |
Launchpad Janitor |
branch linked |
|
lp:ubuntu/bzr-builddeb |
|
| 2011-12-22 19:25:14 |
Bug Watch Updater |
dpkg: status |
New |
Fix Committed |
|
| 2012-01-31 22:48:36 |
Bug Watch Updater |
dpkg: status |
Fix Committed |
Fix Released |
|
| 2012-02-01 23:09:00 |
Bug Watch Updater |
dpkg: status |
Fix Released |
New |
|
| 2012-02-07 01:03:02 |
Bug Watch Updater |
dpkg: status |
New |
Fix Released |
|
