Zero byte successful merge after error from dpkg-mergechangelogs
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Fix Released
|
Undecided
|
Martin Packman | ||
dpkg |
Fix Released
|
Unknown
|
|||
bzr-builddeb (Ubuntu) |
Fix Released
|
Medium
|
Jelmer Vernooij |
Bug 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:
Most recent Ubuntu version: 4.6.2-5ubuntu1
Packaging branch status: CURRENT
Traceback (most recent call last):e merge 1/16
File "/usr/lib/
stream.write(fs % msg.encode(
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/
+N debian/
+N debian/
M debian/changelog
M debian/control
M debian/control.m4
-D debian/
M debian/
M debian/
M debian/
M debian/
M debian/rules.conf
M debian/rules.defs
M debian/
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:
changelog |10138 -------
According to mgz from #bzr bug is in a way how bzr-builddeb/
10:08 hrw@puchatek:
debian/changelog is not conflicted
dpkg-mergechang
dpkg-mergechang
All changes applied successfully.
And changelog file was still empty.
Change was in/usr/
- _logger.
+ _logger.
ProblemType: Bug
DistroRelease: Ubuntu 12.04
Package: bzr-builddeb 2.7.9ubuntu1
ProcVersionSign
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)
PackageArchitec
SourcePackage: bzr-builddeb
UpgradeStatus: No upgrade log present (probably fresh install)
Related branches
- Jelmer Vernooij: Approve (code)
-
Diff: 102 lines (+46/-8)2 files modifiedmerge_changelog.py (+10/-1)
tests/test_merge_changelog.py (+36/-7)
description: | updated |
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 |
Changed in bzr-builddeb: | |
status: | In Progress → Fix Committed |
Changed in dpkg: | |
status: | Unknown → New |
Changed in bzr-builddeb: | |
status: | Fix Committed → Fix Released |
Changed in bzr-builddeb (Ubuntu): | |
status: | Confirmed → In Progress |
assignee: | nobody → Jelmer Vernooij (jelmer) |
Changed in dpkg: | |
status: | New → Fix Committed |
Changed in dpkg: | |
status: | Fix Committed → Fix Released |
Changed in dpkg: | |
status: | Fix Released → New |
Changed in dpkg: | |
status: | New → Fix Released |
Bug happened because of Polish error message was UTF-8:
debian/changelog is not conflicted elogs: ostrzeżenie: /tmp/tmpKJKi6cd eb_changelog_ merge/changelog .this(l0) : oczekiwano first heading, a znaleziono koniec pliku elogs: błąd: ss-970814-1 is not a valid version
dpkg-mergechang
dpkg-mergechang
All changes applied successfully.