[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [virt-tools-list] [PATCH 4/5] v5.1: update autobuild.sh so it works



On 04/09/2013 02:41 AM, Martin Kletzander wrote:
On 04/08/2013 08:56 PM, Gene Czarcinski wrote:
There a some problems with autobuild.sh and this patch addresses
them:

1. Some of the tests fail so temporarily comment out
"prython setup.py test" until things are fixed so the tests
s/prython/python/

run correctly.  At that time, this should be uncommented.

I hope this can uncommented with my series.
As a matter of fact, with you patches for tests, it can be uncommented.

I had a little trouble getting you patches applied but using patch instead of git-apply and just editing the two small changes in patch two, I got it done. "python setup.py test" then ran with no errors.

2. "python setup.py install" needs to use --root= instead
of --prefix=

3. For the rpmbuild, use dist/*.tar.gz instead of *.tar.gz

4. Add "export AUTOBUILD_OVERRIDE_VERSION=y" so that if
the version-id changes are applied, a simpler version-id
is used for autobuild.
.
Signed-off-by: Gene Czarcinski <gene czarc net>
---
  autobuild.sh | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index baa9482..0521165 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -9,11 +9,17 @@ if [ -z "$AUTOBUILD_INSTALL_ROOT" ] ; then
      exit 1
  fi
-python setup.py build
-python setup.py test
-python setup.py install --prefix=$AUTOBUILD_INSTALL_ROOT
+rm -rf MANIFEST dist/*
+
Why are you cleaning 'dist/*' here, when ...
If you run autobuild.sh when in the git-clone-directory-tree, dist can have some old tarballs thus giving *.tar.gz a problem. IIUC, that is not how autobuild.sh normally runs but it does no harm.

+# support version-id changes
+export AUTOBUILD_OVERRIDE_VERSION=y
+
  python setup.py sdist
+python setup.py build
+#python setup.py test
+python setup.py install --root=$AUTOBUILD_INSTALL_ROOT
+
  which /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0
if [ -n "$AUTOBUILD_COUNTER" ]; then
@@ -22,5 +28,5 @@ else
      NOW=`date +"%s"`
      EXTRA_RELEASE=".$USER$NOW"
  fi
-rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
+rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean dist/*.tar.gz
... you're using only 'dist/*.tar.gz' here, which seems less likely to
create trouble (the least being something like 'dist/${pkgname}-*tar.gz') ?

Beware that you added v5.1 outside the [PATCH] tag, so it end up in the
commit message, same for 5/5.  Also this is 2/5, not 4/5, but could end
up as such when doing 'git-am *'.

Forgive my audacity for asking when I'm not ack-giving worthy and take
those as a hint or a curiosity out of my side.  The same applies for
other patches in this series.
I am trying to keep this set of patches together even if they are only loosely coupled (two are tightly coupled). I did not want to clutter the mailinglist with repeated submissions of the same stuff. After more comments and corrections, I will do a "clean" submit.

Gene


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]