diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2015-10-06 11:40:40 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2015-10-20 12:28:41 +0100 |
| commit | 7724ec6c02476f9c9bb0e8df5e6f8a1a11ccf724 (patch) | |
| tree | 0eaef406b5205e8860623387e072d79789f6e572 /.gitignore | |
| parent | f2098a5cc20aa28f2001d9d9e9cca7c7eeeb04e3 (diff) | |
| download | libosinfo-7724ec6c02476f9c9bb0e8df5e6f8a1a11ccf724.tar.gz | |
loader: implement new semantics for entity overriding
This implements the new scheme for allowing entities to
be overridden. If an XML file relative path matches one
in an earlier datbase directory, the original file is
not loaded at all. Any files in a ENTITY-NAME.d will
now augment earlier data rather than replace it.
eg consider these files
1. /usr/share/libosinfo/db/os/fedoraproject.org/fedora-22.xml
2. /etc/libosinfo/db/os/fedoraproject.org/fedora-22.xml
3. $HOME/.config/libosinfo/db/os/fedoraproject.org/fedora-22.d/extra.xml
File #1 will not get loaded, because file #2 is detected
as a full override. File #2 will get loaded to define the
main Fedora 22 OS, and then file #3 will get loaded to
augment the main data.
Most of the PCI and USB device info in the local DB is
just augmenting the pci.ids and usb.ids master files,
so these need to move to .d directories now
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -70,6 +70,7 @@ build/ gtk-doc.make data/95-osinfo.rules data/*/*/*.xml +data/*/*/*/*.xml data/pci.ids data/usb.ids tools/osinfo-detect |