From 3512b93c17f424cbed308e3bda051a2549f8713e Mon Sep 17 00:00:00 2001 From: James Laska Date: Sat, 18 Oct 2014 14:40:43 -0400 Subject: [PATCH] Disable pre-byte-compiling .py files for debian builds Also includes: * Override pysupport build and install arguments * Increase verbosity when logging install_lib changes --- Makefile | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 02468530ef..ddea88268c 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ DEB_PPA ?= reprepro # RPM build parameters RPM_SPECDIR= packaging/rpm RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec -RPM_DIST = $(shell rpm --eval '%{?dist}') +RPM_DIST = $(shell rpm --eval '%{?dist}' 2>/dev/null) ifeq ($(OFFICIAL),yes) RPM_RELEASE = $(RELEASE) else @@ -321,7 +321,7 @@ deb-build/$(SDIST_TAR_NAME): cp -a packaging/debian deb-build/$(SDIST_TAR_NAME)/ sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#$(NAME) ($(VERSION)-$(DEB_RELEASE)) $(DEB_DIST);#" deb-build/$(SDIST_TAR_NAME)/debian/changelog -debian: BYTE_COMPILE = 1 +# debian: BYTE_COMPILE = 1 debian: sdist deb-build/$(SDIST_TAR_NAME) deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb: diff --git a/setup.py b/setup.py index e9f950bcb9..cce2abbfe1 100755 --- a/setup.py +++ b/setup.py @@ -155,7 +155,7 @@ class install_lib(_install_lib, object): log.debug('install_lib skipping: %s', f) continue if f.endswith('.py'): - log.debug('install_lib removing: %s', f) + log.info('install_lib removing: %s', f) os.unlink(f) def get_outputs(self):