[Reproducible-commits] [cdbs] 01/41: Tidy snippets: Reorder variables to e.g. list legacy before modern, and cdbs_curpkg-resolved later.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch reproducible
in repository cdbs.

commit 60c622d490bc1d6142b6b3237e085f7e9d2ac421
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 21 00:40:01 2014 +0100

    Tidy snippets: Reorder variables to e.g. list legacy before modern, and cdbs_curpkg-resolved later.
---
 1/class/python-module.mk.in |  9 +++------
 1/class/python-vars.mk.in   | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/1/class/python-module.mk.in b/1/class/python-module.mk.in
index 4a18b9a..97598ed 100644
--- a/1/class/python-module.mk.in
+++ b/1/class/python-module.mk.in
@@ -30,16 +30,13 @@ DEB_PYTHON_PRIVATE_MODULES_DIRS_ALL ?= $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
 
 # pysupport/pycentral dependencies according to Python policy, appendix A
 CDBS_BUILD_DEPENDS_class_python-module_pysupport ?= python-support
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pysupport),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pysupport))
-
 CDBS_BUILD_DEPENDS_class_python-module_pycentral ?= python-central
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pycentral),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral))
-
 # dh_python2 comes from python package
 CDBS_BUILD_DEPENDS_class_python-module_python2 ?= python
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python2),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2))
-
 CDBS_BUILD_DEPENDS_class_python-module_python3 ?= python3
+CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pysupport),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pysupport))
+CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pycentral),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral))
+CDBS_BUILD_DEPENDS += $(if $(cdbs_python2),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2))
 CDBS_BUILD_DEPENDS += $(if $(cdbs_python3),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python3))
 
 CDBS_BUILD_DEPENDS_class_python-module_args ?= cdbs (>= 0.4.97~)
diff --git a/1/class/python-vars.mk.in b/1/class/python-vars.mk.in
index 2444d86..433a50b 100644
--- a/1/class/python-vars.mk.in
+++ b/1/class/python-vars.mk.in
@@ -59,21 +59,15 @@ cdbs_python_indep_packages = $(filter $(cdbs_python_packages), $(DEB_INDEP_PACKA
 
 cdbs_python_destdir = $(or $(DEB_PYTHON_DESTDIR),$(DEB_DESTDIR))
 
-cdbs_python2 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python2_packages),python2))
-cdbs_python3 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),python3))
 cdbs_python_pysupport = $(filter pysupport,$(DEB_PYTHON_SYSTEM))
 cdbs_python_pycentral = $(filter pycentral,$(DEB_PYTHON_SYSTEM))
 cdbs_python_legacy_system = $(or $(cdbs_python_pysupport),$(cdbs_python_pycentral),$(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral, or leave empty for default python2/python3)))
+cdbs_python2 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python2_packages),python2))
+cdbs_python3 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),python3))
 cdbs_python_systems = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_system),$(if $(cdbs_python2_packages),python2) $(if $(cdbs_python3_packages),python3))
-cdbs_curpythonsystems = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_system),$(strip $(if $(filter $(cdbs_curpkg),$(cdbs_python2_packages)),python2) $(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),python3)))
 
 cdbs_python_stem = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),3))
 cdbs_python_stem += $(if $(word 2,$(cdbs_python_systems)),$(error use of both "python2" and "python3" packaging systems is unsupported here - either change target binary package names, explicitly set DEB_PYTHON2_PACKAGES and/or DEB_PYTHON3_PACKAGES or set an alternative DEB_PYTHON_SYSTEM))
-cdbs_curpythonstem = $(if $(cdbs_python_single_system),$(cdbs_python_stem),$(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),3))
-
-cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -d))
-cdbs_python3_current_binary := $(if $(cdbs_python3),$(shell py3versions -d))
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python$(cdbs_curpythonstem)_current_binary),$(1)),python$(cdbs_curpythonstem),$(1))
 
 # Calculate cdbs_python_build_versions
 cdbs_python_current_version := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -vd))
@@ -87,15 +81,22 @@ cdbs_python3_first_supported_version = $(firstword $(strip $(sort $(cdbs_python3
 # arch(+indep): none; indep: none if current is supported, else first supported
 cdbs_python_nondefault_version = $(if $(cdbs_python_arch_packages),,$(if $(filter $(cdbs_python_current_version),$(cdbs_python_supported_versions)),,$(cdbs_python_first_supported_version)))
 cdbs_python3_nondefault_version = $(if $(cdbs_python_arch_packages),,$(if $(filter $(cdbs_python3_current_version),$(cdbs_python3_supported_versions)),,$(cdbs_python3_first_supported_version)))
-cdbs_curpythonindepbinary = python$(or $(cdbs_python$(cdbs_curpythonstem)_nondefault_version),$(cdbs_curpythonstem))
 
 cdbs_python_primary_version = $(or $(cdbs_python_nondefault_version),$(cdbs_python_current_version))
 cdbs_python3_primary_version = $(or $(cdbs_python3_nondefault_version),$(cdbs_python3_current_version))
-cdbs_curpythonpribinary = python$(cdbs_python$(cdbs_curpythonstem)_primary_version)
 
 # arch(+indep): all; indep: current if supported, else first supported
 cdbs_python_build_versions = $(or $(if $(cdbs_python_arch_packages),$(cdbs_python_supported_versions)),$(cdbs_python_primary_version))
 cdbs_python3_build_versions = $(or $(if $(cdbs_python_arch_packages),$(cdbs_python3_supported_versions)),$(cdbs_python3_primary_version))
+
+cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -d))
+cdbs_python3_current_binary := $(if $(cdbs_python3),$(shell py3versions -d))
+cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python$(cdbs_curpythonstem)_current_binary),$(1)),python$(cdbs_curpythonstem),$(1))
+
+cdbs_curpythonsystems = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_system),$(strip $(if $(filter $(cdbs_curpkg),$(cdbs_python2_packages)),python2) $(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),python3)))
+cdbs_curpythonstem = $(if $(cdbs_python_single_system),$(cdbs_python_stem),$(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),3))
+cdbs_curpythonindepbinary = python$(or $(cdbs_python$(cdbs_curpythonstem)_nondefault_version),$(cdbs_curpythonstem))
+cdbs_curpythonpribinary = python$(cdbs_python$(cdbs_curpythonstem)_primary_version)
 cdbs_curpythonbuildversions = $(cdbs_python$(cdbs_curpythonstem)_build_versions)
 
 # Python-related dependencies according to Python policy, appendix A

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/cdbs.git