On Thu, Feb 23, 2012 at 6:37 PM, Jakub Wilk <jw...@debian.org> wrote: > Thanks for looking into this!
But of course! I didn't realize this was your bug until after I looked at it just now :) Sorry about the "ignore" - gmail dropped your RE to me into spam. Gah. > > * Paul Tagliamonte <t...@pault.ag>, 2012-02-23, 18:09: >> >> -Build-Depends: debhelper (>= 7.0.8), python (>= 2.6.6-3~) >> +Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), >> python-dulwich > > > For consistency with Depends, I'd add version constraint to python-dulwich. ACK'd. Updated. It's now: python-dulwich (>= 0.8) > >> -X-Python-Version: >= 2.5 >> +X-Python-Version: >= 2.6 > > > Hmm, why? I assumed (wrongly) that because the python b-d was that high, this should be tied to that. Noted & fixed. > >> -Format: http://dep.debian.net/deps/dep5 >> +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 > > > Wow, I didn't know it's need this to run tests these days. ;P Hey man, I'm in here doing some spring cleaning, why not ;) > >> +override_dh_auto_test: >> +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) >> + set -e; cd tests; for x in $(shell pyversions -r); do \ >> + $$x run-tests.py --with-hg=`which hg`; \ >> + done >> +endif > > > It's really that easy? Great. :) Yep :) > But it FTBFS here with: > | set -e; cd tests; for x in python2.7 python2.6; do \ > | $x run-tests.py --with-hg=`which hg`; \ Also, $(shell-ize the backticks. > | done > | Traceback (most recent call last): > | WARNING: Did not find prerequisite tool: unzip > | File "run-tests.py", line 708, in <module> > | main() > | File "run-tests.py", line 704, in main > | runtests(options, expecthg, tests) > | File "run-tests.py", line 566, in runtests > | installhg(options) > | File "run-tests.py", line 239, in installhg > | usecorrectpython() > | File "run-tests.py", line 199, in usecorrectpython > | os.symlink(sys.executable, mypython) > | OSError: [Errno 2] No such file or directory Grrr. I'm having a hard time reproducing this. Any ideas on how to reproduce the FTBFS? I've tried it in a sid chroot, which resulted in a bunch of lines like: | ERROR: test-octopus output changed | --- Expected output | +++ Test output | @@ -5,7 +5,7 @@ | Switched to branch "master" | Trying simple merge with branch1 | Trying simple merge with branch2 | -Merge made by octopus. | +Merge made by the 'octopus' strategy. | beta | 1 + | gamma | 1 + | 2 files changed, 2 insertions(+), 0 deletions(-) Which looks like strings have changed. Perhaps upstream needs to fix the tests? Here's the run with a compatible version of hg on the system (which is *not* in a chroot, which is why it works) | set -e; cd tests; for x in python2.7 python2.6; do \ | $x run-tests.py --with-hg=/usr/bin/hg; \ | done | ................s....s.. | Skipped test-outgoing: irrelevant | Skipped test-sane-without-bookmarks: irrelevant | # Tested unexpected mercurial: None | # Ran 24 tests, 2 skipped, 0 failed. | ................s....s.. | Skipped test-outgoing: irrelevant | Skipped test-sane-without-bookmarks: irrelevant | # Tested unexpected mercurial: None | # Ran 24 tests, 2 skipped, 0 failed. I'll FW a bug to upstream about the tests, but so long as they don't change systems, the test code should hold. > > -- > Jakub Wilk New patch re-attached. I'm sure it won't solve the OSError, because I can't dupe it (so I couldn't attempt a fix). Fondly, Paul
Index: control =================================================================== --- control (revision 8210) +++ control (working copy) @@ -3,7 +3,8 @@ Priority: optional Maintainer: Qijiang Fan <fqj1...@gmail.com> Uploaders: Python Applications Packaging Team <python-apps-t...@lists.alioth.debian.org> -Build-Depends: debhelper (>= 7.0.8), python (>= 2.6.6-3~) +Build-Depends: debhelper (>= 7.0.50~), git, mercurial (>= 1.9.1-1~), + python (>= 2.6.6-3~), python-all, python-dulwich (>= 0.8), unzip Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://hg-git.github.com/ @@ -12,7 +13,8 @@ Package: mercurial-git Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.9.1-1~), python-dulwich (>= 0.8) +Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.9.1-1~), + python-dulwich (>= 0.8) Description: Git plugin for Mercurial The Hg-Git plugin for Mercurial adds the ability to push and pull to/from a Git server repository. This means you can collaborate on Git based Index: copyright =================================================================== --- copyright (revision 8210) +++ copyright (working copy) @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: hg-git Upstream-Contact: Scott Chacon <scha...@gmail.com> Source: http://hg-git.github.com/ Index: rules =================================================================== --- rules (revision 8210) +++ rules (working copy) @@ -1,30 +1,22 @@ #!/usr/bin/make -f +PACKAGE_NAME=hg-git MODULE_DIR = usr/lib/$(shell pyversions -d)/site-packages/hgext/git/ -build build-arch build-indep: +%: + dh $@ --with python2 -clean: - dh clean +override_dh_auto_clean: + dh_auto_clean find $(CURDIR) -type f -name '*\.py[co]' -delete -install: build - dh install --until dh_prep - dh_installdirs $(MODULE_DIR) - cp -r hggit/*.py debian/mercurial-git/$(MODULE_DIR)/ - dh install --after dh_install --with python2 +override_dh_auto_install: + mkdir -p debian/$(PACKAGE_NAME)/$(MODULE_DIR)/ + cp -vr hggit/*.py debian/$(PACKAGE_NAME)/$(MODULE_DIR)/ -# Build architecture-independent files here. -binary-indep: install - dh binary-indep - -binary-arch: - -binary: binary-indep binary-arch - -patch unpatch: - dh_quilt_$(@) - -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install patch unpatch - -# vim:ts=4 sw=4 noet +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + set -e; cd tests; for x in $(shell pyversions -r); do \ + $$x run-tests.py --with-hg=$(shell which hg); \ + done +endif
