Thank you for the review. I pushed this to "master". I'll push it to maintenance branches once the autobuilder gives me the thumbs-up.
Thanks Ethan and Luca, Ben. On Fri, Feb 03, 2012 at 01:37:55PM -0800, Ethan Jackson wrote: > Looks good, thanks. > > Ethan > > On Fri, Feb 3, 2012 at 13:33, Ben Pfaff <b...@nicira.com> wrote: > > > Python 2.4 is obsolete, not present in Debian squeeze or sid, so don't > > install Python modules for it. > > > > It would be better to just put the files directly into > > /usr/share/pyshared/ovs/, instead of in site-packages for some specific > > Python version, but this causes problems for builds on squeeze, as > > documented in commit bc3aa0bf5 (debian: Make python-openvswitch packaging > > work with squeeze dh_python2.): > > > > The dh_python2 helper in Debian squeeze has a limitation that is not > > mentioned anywhere, as far as I can tell: Python files must be in > > /usr/lib/python#.#/site-packages to be installed. The version in Debian > > wheezy does not have the same limitation. > > > > This meant that building the Debian packages on squeeze silently > > produced > > a broken python-openvswitch package, whereas building the same thing on > > wheezy built a working package. > > > > This fixes the problem by putting the .py files where squeeze expects > > them. > > It works on wheezy too. > > > > A before-and-after "debdiff" shows that the only significant effect of this > > commit is to drop python2.4 symlinks. > > > > CC: ho...@debian.org > > Reported-by: Luca Falavigna <ftpmas...@debian.org> > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > --- > > Luca, thanks for pointing this out. > > > > AUTHORS | 1 + > > debian/openvswitch-test.install | 2 +- > > debian/python-openvswitch.install | 2 +- > > 3 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/AUTHORS b/AUTHORS > > index c19bbde..d581266 100644 > > --- a/AUTHORS > > +++ b/AUTHORS > > @@ -102,6 +102,7 @@ Joan Cirer j...@ev0.net > > John Galgay j...@galgay.net > > Koichi Yagishita yagishita.koi...@jrc.co.jp > > Krishna Miriyala kris...@nicira.com > > +Luca Falavigna dktrkr...@debian.org > > Luiz Henrique Ozaki luiz.oz...@gmail.com > > Michael A. Collins mike.a.coll...@ark-net.org > > Michael Hu m...@nicira.com > > diff --git a/debian/openvswitch-test.install > > b/debian/openvswitch-test.install > > index a152aff..a36c828 100644 > > --- a/debian/openvswitch-test.install > > +++ b/debian/openvswitch-test.install > > @@ -1,2 +1,2 @@ > > -usr/share/openvswitch/python/ovstest usr/lib/python2.4/site-packages/ > > +usr/share/openvswitch/python/ovstest usr/lib/python2.6/dist-packages/ > > usr/bin/ovs-test > > diff --git a/debian/python-openvswitch.install > > b/debian/python-openvswitch.install > > index 6779298..9387e68 100644 > > --- a/debian/python-openvswitch.install > > +++ b/debian/python-openvswitch.install > > @@ -1 +1 @@ > > -usr/share/openvswitch/python/ovs usr/lib/python2.4/site-packages/ > > +usr/share/openvswitch/python/ovs usr/lib/python2.6/dist-packages/ > > -- > > 1.7.2.5 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
