Bug#376732: [Build-common-hackers] Bug#376732: cdbs: pyversions call in python-distutils seems wrong

2006-07-04 Thread Martin Pitt
Hi,

Loïc Minier [2006-07-04 17:15 +0200]:
  cd .  pythonXS-Python-Version setup.py build 
  --build-base=/home/martin/ubuntu/merges/pyxdg-0.15/./build
  /bin/sh: pythonXS-Python-Version: not found
  make: *** [python-build-stamp-XS-Python-Version] Fehler 127
 
  (The patch you mention is missing, perhaps it was stripped or you
  forgot it.)

Erm, error on network layer 8... :/ Attached now.

Martin

-- 
Martin Pitthttp://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org

In a world without walls and fences, who needs Windows and Gates?
--- /usr/share/cdbs/1/class/python-distutils.mk 2006-07-03 12:09:07.0 
+0200
+++ /tmp/python-distutils.mk2006-07-04 17:44:26.0 +0200
@@ -48,7 +48,7 @@
 
 # check python system
 cdbs_use_xs_field := $(shell grep -q ^XS-Python-Version: debian/control  
echo yes)
-cdbs_selected_pycompat := $(shell if [[ -e debian/pycompat ]]; then cat 
debian/pycompat; fi)
+cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat 
debian/pycompat; fi)
 cdbs_pycompat = $(cdbs_selected_pycompat)
 ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
   cdbs_python_support_path = 
usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
@@ -167,14 +167,14 @@
 cdbs_python_current_version := $(shell pyversions -vd)
 ifeq (all, $(cdbs_python_module_arch))
   # check if current is in build versions
-  ifneq ($(cdbs_python_current_version), $(filter 
$(cdbs_python_current_version), $(shell pyversions -vr)))
-cdbs_python_compile_version := $(firstword $(strip $(sort $(shell 
pyversions -vr
+  ifneq ($(cdbs_python_current_version), $(filter 
$(cdbs_python_current_version), $(shell pyversions -vr debian/control)))
+cdbs_python_compile_version := $(firstword $(strip $(sort $(shell 
pyversions -vr debian/control
 cdbs_python_build_versions := $(cdbs_python_compile_version)
   else
 cdbs_python_build_versions := $(cdbs_python_current_version)
   endif
 else
-cdbs_python_build_versions := $(shell pyversions -vr)
+cdbs_python_build_versions := $(shell pyversions -vr debian/control)
 endif # archall
 
 # check if build is possible


signature.asc
Description: Digital signature


Bug#376732: [Build-common-hackers] Bug#376732: cdbs: pyversions call in python-distutils seems wrong

2006-07-04 Thread Loïc Minier
On Tue, Jul 04, 2006, Martin Pitt wrote:
 python-distutils.mk currently calls 'pyversions -vr' in several
 places, but this fails:
 - snip -
 $ pyversions -vr
 usage: [-v] [-h] [-d|--default] [-s|--supported] [-i|--installed] 
 [-r|--requested version string|control file]
 
 pyversions: error: -r option requires an argument

 bee% cd svn/debian/pkg-gnome/desktop/unstable/gnome-python-desktop 
 bee% pyversions -vr
 2.3 2.4

 It works here, but I do have XS-Python-Version.  This is with
 pyversions from python 2.3.5-11.

 cd .  pythonXS-Python-Version setup.py build 
 --build-base=/home/martin/ubuntu/merges/pyxdg-0.15/./build
 /bin/sh: pythonXS-Python-Version: not found
 make: *** [python-build-stamp-XS-Python-Version] Fehler 127

 (The patch you mention is missing, perhaps it was stripped or you
 forgot it.)

 This looks like the result of `pyversion ...` which would output
 XS-Python-Version not found on stderr, but this is only a guess.

-- 
Loïc Minier [EMAIL PROTECTED]