Bug#463349: [Pkg-bazaar-maint] Bug#463349: bzr-builddeb: PATCH: merge build failing when upstream has subdirs
On Wed, 2009-01-21 at 11:38 +, Ross Burton wrote: > Hi, > > I'm using bzr-builddeb 2.0.1 from experimental, and merge mode isn't > doing what I expect. > > I have an openconnect bzr repository, with an unstable/ branch which > contains the debian/. There is a openconnect_0.99.orig.tar.gz, but when > I build using bzr bd --merge I get this layout: Hi, Thanks for the bug report. > ./openconnect-0.99/pax_global_header That's the issue. It's a tar extension that the python tarfile module doesn't know what to do with, so it just presents it as a regular file. This then disrupts the check whether the tarball contains only a single directory. I'm working on fixing this. Thanks, James -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#463349: bzr-builddeb: PATCH: merge build failing when upstream has subdirs
Hi, I'm using bzr-builddeb 2.0.1 from experimental, and merge mode isn't doing what I expect. I have an openconnect bzr repository, with an unstable/ branch which contains the debian/. There is a openconnect_0.99.orig.tar.gz, but when I build using bzr bd --merge I get this layout: r...@blackadder ~/Local/mess/03/openconnect/build-area $ find . ./openconnect_0.99.orig.tar.gz ./openconnect-0.99 ./openconnect-0.99/debian ./openconnect-0.99/debian/rules ./openconnect-0.99/debian/changelog ./openconnect-0.99/debian/copyright ./openconnect-0.99/debian/compat ./openconnect-0.99/debian/watch ./openconnect-0.99/debian/control ./openconnect-0.99/pax_global_header ./openconnect-0.99/openconnect-0.99 ./openconnect-0.99/openconnect-0.99/auth-dlg-settings.h ./openconnect-0.99/openconnect-0.99/ssl_ui.c ./openconnect-0.99/openconnect-0.99/dtls.c ./openconnect-0.99/openconnect-0.99/TODO ./openconnect-0.99/openconnect-0.99/ssl.c ./openconnect-0.99/openconnect-0.99/http.c ./openconnect-0.99/openconnect-0.99/version.sh ./openconnect-0.99/openconnect-0.99/README.SecurID ./openconnect-0.99/openconnect-0.99/tun.c ./openconnect-0.99/openconnect-0.99/cstp.c ./openconnect-0.99/openconnect-0.99/securid.c ./openconnect-0.99/openconnect-0.99/ssl_ui_gtk.c ./openconnect-0.99/openconnect-0.99/mainloop.c ./openconnect-0.99/openconnect-0.99/main.c ./openconnect-0.99/openconnect-0.99/openconnect.h ./openconnect-0.99/openconnect-0.99/Makefile ./openconnect-0.99/openconnect-0.99/nm-auth-dialog.c ./openconnect-0.99/openconnect-0.99/openconnect.8 ./openconnect-0.99/openconnect-0.99/xml.c ./openconnect-0.99/openconnect-0.99/.gitignore ./openconnect-0.99/openconnect-0.99/COPYING.LGPL ./openconnect_0.99-1.dsc ./openconnect_0.99-1.diff.gz This is wrong, there should be no openconnect-0.99 directory inside openconnect-0.99. Ross -- Ross Burton mail: r...@burtonini.com jabber: r...@burtonini.com www: http://burtonini.com signature.asc Description: This is a digitally signed message part
Bug#463349: bzr-builddeb: PATCH: merge build failing when upstream has subdirs
Package: bzr-builddeb Version: 0.90ubuntu1 Severity: normal This looks similar to #440069, but since that one is closed, (and now I have a patch), here we go. When an upstream tarball contains a subdirectory, any merge-build will fail. This is because shutil.move works in a non-intuitive way. (See http://mail.python.org/pipermail/python-list/2003-December/240968.html) The following patch fixes this. === modified file 'builder.py' --- builder.py 2008-01-30 23:59:16 + +++ builder.py 2008-01-30 23:59:28 + @@ -286,7 +286,8 @@ files = glob.glob(tempdir+'/*') os.makedirs(source_dir) for file in files: -shutil.move(file, source_dir) +dest = os.path.join(source_dir, os.path.basename(file)) +shutil.move(file, dest) shutil.rmtree(tempdir) if not upstream: shutil.copy(tarball, build_dir) -- System Information: Debian Release: lenny/sid APT prefers gutsy-updates APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500, 'gutsy-backports'), (500, 'gutsy') Architecture: i386 (i686) Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages bzr-builddeb depends on: ii bzr 1.0-2~bazaar1~gutsy1 easy to use distributed version co ii bzrtools1.0.0-1bazaar1 Collection of tools for bzr ii devscripts 2.10.7ubuntu5Scripts to make the life of a Debi ii dpkg-dev1.14.5ubuntu16 package building tools for Debian ii fakeroot1.7.1ubuntu1 Gives a fake root environment ii patchutils 0.2.31-4 Utilities to work with patches ii python 2.5.1-1ubuntu2 An interactive high-level object-o ii python-central 0.5.15ubuntu2register and build utility for Pyt ii python-debian 0.1.5python modules to work with Debian bzr-builddeb recommends no packages. -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
