On Thu, Aug 02, 2012 at 05:29:51PM -0700, Ansis Atteka wrote: > On Thu, Aug 2, 2012 at 5:06 PM, Ben Pfaff <b...@nicira.com> wrote: > > > On Thu, Aug 02, 2012 at 04:57:25PM -0700, Ansis Atteka wrote: > > > > From: Ben Pfaff <b...@nicira.com> > > > > Date: Thu, 2 Aug 2012 16:01:49 -0700 > > > > Subject: [PATCH] dirs: dbdir default must be based on sysconfdir. > > > > > > > > Some in-tree and out-of-tree code sets the OVS_SYSCONFDIR environment > > > > variable to control where /etc files go (mostly for test purposes). > > When > > > > the database directory (dbdir) was split off from the sysconfdir, the > > > > configure-time default continued to be based on the sysconfdir, but > > > > overriding the sysconfdir at runtime with OVS_SYSCONFDIR didn't have > > any > > > > effect on the dbdir, which caused a visible change in behavior for code > > > > that set the OVS_SYSCONFDIR environment variable. This commit reverts > > that > > > > change in behavior, by basing the dbdir on OVS_SYSCONFDIR if that > > > > environment variable is set (but the OVS_DBDIR environment variable is > > > > not). > > > > > > > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > > > --- > > > > v1->v2: Fix issues pointed out by Ansis, fix up ovs-ctl.in also. > > > > v2->v3: Fix more issues pointed out by Ansis. > > > > ... > > > > > Now I am a little bit confused. If I do ./configure --prefix="/aaa", then > > > what should > > > be the expected paths in dirs.c and dirs.py after make? I thought that > > they > > > should > > > match? > > > > dirs.c should have the installed paths. > > > > dirs.py in the source tree is invariant: it always has the default > > paths. It's only there at all because otherwise the unit tests won't > > work because they won't be able to import ovs.dirs. > > > > At install time, we install a correct dirs.py as configured into the > > install directory. > > > > All of the above are correct before and after this commit. > > > Thanks. Looks good to me!
Thanks. I uploaded this to Debian as -8. I'll push it to master in a bit. I should add something to my explanation above for dirs.py in the source tree: the particular directories in dirs.py don't really matter. We could use the configured directories there, for example. But we don't want to rebuild dirs.py if we don't have to, because that would break "make distcheck" by trying to modify a file in the source directory, so instead we use invariant directories. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
