External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 22:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Disable pre-byte-compiling .py files for debian builds

Browse Source 
Also includes:
* Override pysupport build and install arguments
* Increase verbosity when logging install_lib changes
This commit is contained in:
James Laska
2014-10-18 14:40:43 -04:00
parent c2c0dee090
commit 3512b93c17
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -55,7 +55,7 @@ DEB_PPA ?= reprepro
# RPM build parameters # RPM build parameters
RPM_SPECDIR= packaging/rpm RPM_SPECDIR= packaging/rpm
RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec
RPM_DIST = $(shell rpm --eval '%{?dist}') RPM_DIST = $(shell rpm --eval '%{?dist}' 2>/dev/null)
ifeq ($(OFFICIAL),yes) ifeq ($(OFFICIAL),yes)
RPM_RELEASE = $(RELEASE) RPM_RELEASE = $(RELEASE)
else else
@@ -321,7 +321,7 @@ deb-build/$(SDIST_TAR_NAME):
cp -a packaging/debian 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 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) debian: sdist deb-build/$(SDIST_TAR_NAME)
deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb: deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb:

2
setup.py
View File

@@ -155,7 +155,7 @@ class install_lib(_install_lib, object):
log.debug('install_lib skipping: %s', f) log.debug('install_lib skipping: %s', f)
continue continue
if f.endswith('.py'): if f.endswith('.py'):
log.debug('install_lib removing: %s', f) log.info('install_lib removing: %s', f)
os.unlink(f) os.unlink(f)
def get_outputs(self): def get_outputs(self):