[ovs-dev] [PATCH] debian: Package the installed Python files, not those from the source tree.

[Ben Pfaff]

Thanks, I pushed this.

I cherry-picked this to branch-1.2 also.  I think it's good to get the
log directory, at least, correct there.

On Wed, Oct 05, 2011 at 03:24:05PM -0700, Ethan Jackson wrote:
> Looks good,
> 
> Ethan
> 
> On Wed, Oct 5, 2011 at 14:55, Ben Pfaff <blp at nicira.com> wrote:
> > The only difference between the Python files that are installed and the
> > Python files found in the source tree is in the ovs.dirs module, but this
> > is a very important difference: we want the directories used to be the ones
> > configured in (e.g. /usr/share/openvswitch), not the only used by default
> > by the source tree's dirs.py (e.g. /usr/local/share/openvswitch).
> >
> > I verified with "dpkg-deb -x" and "diff -ur" that in fact this is the only
> > change that this commit makes.
> >
> > This bug has been in place since at least commit 1d273d6d8 "debian: Rename
> > openvswitch-python to python-openvswitch" from over a year ago, but until
> > now the packaged Python files didn't actually use any directories that
> > differed between the two versions of dirs.py, so only now has the problem
> > manifested.
> >
> > This problem prevented ovs-monitor-ipsec from finding the OVSDB schema
> > file.
> >
> > Reported-by: Ethan Jackson <ethan at nicira.com>
> > ---
> > ?debian/python-openvswitch.install | ? ?3 +--
> > ?1 files changed, 1 insertions(+), 2 deletions(-)
> >
> > diff --git a/debian/python-openvswitch.install b/debian/python-openvswitch.install
> > index fb901b7..ef84d2b 100644
> > --- a/debian/python-openvswitch.install
> > +++ b/debian/python-openvswitch.install
> > @@ -1,2 +1 @@
> > -python/ovs/*.py usr/lib/python2.4/site-packages/ovs/
> > -python/ovs/db/*.py usr/lib/python2.4/site-packages/ovs/db/
> > +usr/share/openvswitch/python/* usr/lib/python2.4/site-packages/
> > --
> > 1.7.2.5
> >
> >