[PATCH] fix installation of autoqa python library

[Kamil Paral]

removing --skip-build option, because it failed on machines where there
was no build/ directory
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index d2e0164..b7d7eb4 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ install:
 	for t in tests/*; do cp -a $$t $(PREFIX)$(TEST_DIR); done
 	install -d $(PREFIX)$(AUTOTEST_DIR)/client/bin
 	install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin
-	( cd lib/python; python setup.py install -O1 --skip-build --root $(PREFIX)/ )
+	( cd lib/python; python setup.py install -O1 --root $(PREFIX)/ )
 
 build:
 	@echo no build necessary
-- 
1.6.2.5

[James Laska]

On Thu, 2009-11-05 at 17:23 +0100, Kamil Páral wrote:
>  removing --skip-build option, because it failed on machines where
> there
>  was no build/ directory
>  ---
>   Makefile |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>  
>  diff --git a/Makefile b/Makefile
>  index d2e0164..b7d7eb4 100644
>  --- a/Makefile
>  +++ b/Makefile
>  @@ -24,7 +24,7 @@ install:
>   	for t in tests/*; do cp -a $$t $(PREFIX)$(TEST_DIR); done
>   	install -d $(PREFIX)$(AUTOTEST_DIR)/client/bin
>   	install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin
>  -	( cd lib/python; python setup.py install -O1 --skip-build --root $(PREFIX)/ )
>  +	( cd lib/python; python setup.py install -O1 --root $(PREFIX)/ )
>   
>   build:
>   	@echo no build necessary 
Tested 'make rpm' with that change.  Doesn't seem to introduce any
problems.  How were you using 'make' when you ran into this issue?

Thanks,
James

[Kamil Paral]

----- "James Laska" <jlaska(a)redhat.com&gt; wrote:
>  
>  Tested 'make rpm' with that change.  Doesn't seem to introduce any
>  problems.  How were you using 'make' when you ran into this issue?
>  
>  Thanks,
>  James 
I'm sorry, I should have included more clearer description why the patch
is needed. This is the output with --skip-build present (note the 
warning line):

[root@at autoqa]# make install
install -d /usr/bin /var/cache/autoqa
install autoqa /usr/bin/
install -d /etc/cron.d
install -m 0644 autoqa.cron /etc/cron.d/autoqa
install -d /usr/share/autoqa
for h in hooks/*; do cp -a $h /usr/share/autoqa; done
install -d /usr/share/autotest/client/site_tests
for t in tests/*; do cp -a $t /usr/share/autotest/client/site_tests; done
install -d /usr/share/autotest/client/bin
install -m 0644 lib/autotest/site_utils.py /usr/share/autotest/client/bin
( cd lib/python; python setup.py install -O1 --skip-build --root / )
running install
running install_lib
warning: install_lib: 'build/lib' does not exist -- no Python modules to install
running install_egg_info
Removing /usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info
Writing /usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info

[root@at autoqa]# ls /usr/lib/python2.6/site-packages/autoqa*
/usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info

(no autoqa library installed, only .egg-info)

And this is the ouput without --skip-build present:

[root@at autoqa]# make install
install -d /usr/bin /var/cache/autoqa
install autoqa /usr/bin/
install -d /etc/cron.d
install -m 0644 autoqa.cron /etc/cron.d/autoqa
install -d /usr/share/autoqa
for h in hooks/*; do cp -a $h /usr/share/autoqa; done
install -d /usr/share/autotest/client/site_tests
for t in tests/*; do cp -a $t /usr/share/autotest/client/site_tests; done
install -d /usr/share/autotest/client/bin
install -m 0644 lib/autotest/site_utils.py /usr/share/autotest/client/bin
( cd lib/python; python setup.py install -O1 --root / )
running install
running build
running build_py
creating build
creating build/lib
creating build/lib/autoqa
copying virtguest.py -> build/lib/autoqa
copying __init__.py -> build/lib/autoqa
copying repoinfo.py -> build/lib/autoqa
copying rats.py -> build/lib/autoqa
running install_lib
creating /usr/lib/python2.6/site-packages/autoqa
copying build/lib/autoqa/virtguest.py -> /usr/lib/python2.6/site-packages/autoqa
copying build/lib/autoqa/__init__.py -> /usr/lib/python2.6/site-packages/autoqa
copying build/lib/autoqa/repoinfo.py -> /usr/lib/python2.6/site-packages/autoqa
copying build/lib/autoqa/rats.py -> /usr/lib/python2.6/site-packages/autoqa
byte-compiling /usr/lib/python2.6/site-packages/autoqa/virtguest.py to virtguest.pyc
byte-compiling /usr/lib/python2.6/site-packages/autoqa/__init__.py to __init__.pyc
byte-compiling /usr/lib/python2.6/site-packages/autoqa/repoinfo.py to repoinfo.pyc
byte-compiling /usr/lib/python2.6/site-packages/autoqa/rats.py to rats.pyc
writing byte-compilation script '/tmp/tmpERN15k.py'
/usr/bin/python -O /tmp/tmpERN15k.py
removing /tmp/tmpERN15k.py
running install_egg_info
Removing /usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info
Writing /usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info

[root@at autoqa]# ls /usr/lib/python2.6/site-packages/autoqa*
/usr/lib/python2.6/site-packages/autoqa-0.2-py2.6.egg-info
/usr/lib/python2.6/site-packages/autoqa:
__init__.py  __init__.pyc  __init__.pyo  rats.py  rats.pyc  rats.pyo  repoinfo.py 
repoinfo.pyc  repoinfo.pyo  virtguest.py  virtguest.pyc  virtguest.pyo

(autoqa library installed)