correct-python-path.diff: Fallback on the correct path if rpm query fails.

This commit is contained in:
Timo Aaltonen
2013-02-12 21:03:55 +02:00
parent adefd18b30
commit eddcdeac37
3 changed files with 14 additions and 0 deletions

2
debian/changelog vendored
View File

@@ -29,5 +29,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low
* control: Add python-krbv to client depends.
* Add fix-nss-include.diff, fix nss include path.
* Add no-test-lang.diff, test_lang is gone.
* correct-python-path.diff: Fallback on the correct path if rpm query
fails.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Nov 2011 10:52:25 -0400

11
debian/patches/correct-python-path.diff vendored Normal file
View File

@@ -0,0 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ ifneq ($(DEVELOPER_MODE),0)
LINT_OPTIONS=--no-fail
endif
-PYTHON ?= $(shell rpm -E %__python)
+PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python)
all: bootstrap-autogen server
@for subdir in $(SUBDIRS); do \

View File

@@ -4,3 +4,4 @@ prefix.patch
fix-string-format.diff
fix-nss-include.diff
no-test-lang.diff
correct-python-path.diff