← Back to branch summary

~james-page/ubuntu/saucy/openvswitch/1.12-snapshot

« back to all changes in this revision

Viewing changes to python/ovs/dirs.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-08-07 16:00:53 UTC
  • mfrom: (5.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20120807160053-nj4pgmkn6bp8t4md
Tags: 1.4.2+git20120612-9ubuntu1
* Merge from Debian unstable; remaining changes:
  - d/control: Disable openvswitch-datapath-dkms package.
* Dropped changes:
  - d/patches/kernel_3.5_support.patch: Superceded by 
    bug-684057-ovs-ctl-Add-support-for-newer-module-name.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
python/ovs/dirs.py
1
 
# These are the default directories.  They will be replaced by the
2
 
# configured directories at install time.
 
1
import os
 
2
PKGDATADIR = os.environ.get("OVS_PKGDATADIR", """/usr/local/share/openvswitch""")
 
3
RUNDIR = os.environ.get("OVS_RUNDIR", """/var/run""")
 
4
LOGDIR = os.environ.get("OVS_LOGDIR", """/usr/local/var/log""")
 
5
BINDIR = os.environ.get("OVS_BINDIR", """/usr/local/bin""")
3
6
 
4
 
import os
5
 
PKGDATADIR = os.environ.get("OVS_PKGDATADIR", "/usr/local/share/openvswitch")
6
 
RUNDIR = os.environ.get("OVS_RUNDIR", "/var/run")
7
 
LOGDIR = os.environ.get("OVS_LOGDIR", "/usr/local/var/log")
8
 
BINDIR = os.environ.get("OVS_BINDIR", "/usr/local/bin")
 
7
DBDIR = os.environ.get("OVS_DBDIR")
 
8
if not DBDIR:
 
9
    sysconfdir = os.environ.get("OVS_SYSCONFDIR")
 
10
    if sysconfdir:
 
11
        DBDIR = "%s/openvswitch" % sysconfdir
 
12
    else:
 
13
        DBDIR = """/usr/local/etc/openvswitch"""