merge-upstream fails for new packages
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Medium
|
Jelmer Vernooij | ||
Bug Description
When trying to create a new package from scratch (no debian/ dir etc) merge-upstream fails with:
$ bzr merge-upstream /tmp/glcompbenc
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
package, distribution)
File "/usr/lib/
changelog, larstiq)
UnboundLocalError: local variable 'larstiq' referenced before assignment
The error happens with both the natty version and latest bzr revision.
Related branches
- James Westby: Approve
- Jelmer Vernooij: Pending requested
-
Diff: 139 lines (+37/-15)5 files modifiedcmds.py (+10/-6)
debian/changelog (+4/-1)
import_dsc.py (+5/-4)
merge_upstream.py (+10/-4)
tests/blackbox/test_merge_upstream.py (+8/-0)
- Jelmer Vernooij: Pending requested
-
Diff: 3368 lines (+1369/-932)30 files modified__init__.py (+43/-30)
bzr-builddeb_0.1-1_i386.changes (+0/-21)
changes.py (+0/-84)
cmds.py (+96/-81)
config.py (+6/-6)
debian/NEWS (+6/-0)
debian/changelog (+128/-2)
debian/control (+3/-4)
debian/rules (+12/-3)
doc/user_manual/configuration.rst (+3/-3)
doc/user_manual/hooks.rst (+5/-0)
errors.py (+1/-8)
import_dsc.py (+41/-170)
info.py (+1/-1)
launchpad.py (+55/-11)
merge_package.py (+1/-1)
merge_upstream.py (+11/-148)
setup.py (+2/-1)
tests/__init__.py (+0/-1)
tests/blackbox/test_builddeb.py (+2/-1)
tests/blackbox/test_do.py (+5/-2)
tests/blackbox/test_merge_upstream.py (+43/-1)
tests/test_import_dsc.py (+17/-37)
tests/test_merge_upstream.py (+4/-113)
tests/test_repack_tarball.py (+3/-1)
tests/test_upstream.py (+345/-7)
tests/test_util.py (+24/-56)
upstream/__init__.py (+130/-71)
upstream/branch.py (+300/-0)
util.py (+82/-68)
| summary: |
- Cannot use merge-upstream for a new package + merge-upstream fails for new packages |
| Changed in bzr-builddeb: | |
| status: | New → Triaged |
| status: | Triaged → In Progress |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| importance: | Undecided → Medium |
| Changed in bzr-builddeb: | |
| status: | In Progress → Fix Committed |
| milestone: | none → 2.8 |
| Alexandros Frantzis (afrantzis) wrote | #1 |
| Jelmer Vernooij (jelmer) wrote Re: [Bug 772225] Re: merge-upstream fails for new packages | #2 |
| summary: |
- merge-upstream fails for new packages + Default build_type in empty branch should be normal, not |
| summary: |
- Default build_type in empty branch should be normal, not + Default build_type in empty branch should be normal, not merge |
| Jelmer Vernooij (jelmer) wrote | #3 |
| summary: |
- Default build_type in empty branch should be normal, not merge + merge-upstream fails for new packages |
| Changed in bzr-builddeb: | |
| milestone: | 2.8 → 2.7.4 |
| status: | Fix Committed → Fix Released |
With the latest changes in trunk the errors have gone away, but the command still doesn't work correctly (at least not as I would expect):
$ bzr init hello && cd hello
$ bzr merge-upstream ../hello-2.7.tar.gz --package hello --version 2.7 --distribution natty
Using version string 2.7.
An entry for the new upstream version has been added to the changelog.
$ bzr st
added:
debian/
unknown:
debian/changelog
$ ls
debian
The tarball contents aren't included in the branch.