diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-16 16:59:39 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-16 17:04:54 +0000 |
| commit | 042247b3e428cb7352c06a670576819c67378090 (patch) | |
| tree | 7faec906f90ec86a67a1bdf925ca6b6490086f4f /desktop/source/deployment/manager | |
| parent | 6beeefab7698e86eb7864196a35c232ff84625fa (diff) | |
Fixup legacy sleepycat db database usage for packages
Previously empty legacy registered_packages.db databases were created
unconditionally, at some efficiency and startup cost, despite these
being deprectated since before version 3.2.
We now handle version mismatches by warning on the console and ignoring
these files.
Diffstat (limited to 'desktop/source/deployment/manager')
| -rw-r--r-- | desktop/source/deployment/manager/dp_activepackages.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_activepackages.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index f220aaf40daa..47cc72fcabbf 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -127,8 +127,7 @@ namespace dp_manager { ActivePackages::ActivePackages() {} -ActivePackages::ActivePackages(::rtl::OUString const & url, bool readOnly): - m_map(url, readOnly) {} +ActivePackages::ActivePackages(::rtl::OUString const & url) : m_map(url) {} ActivePackages::~ActivePackages() {} diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 2a4d18686346..61057bc9533e 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -71,7 +71,7 @@ public: ActivePackages(); - ActivePackages(::rtl::OUString const & url, bool readOnly); + ActivePackages(::rtl::OUString const & url); ~ActivePackages(); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 680dbf855d9d..0e88d1f2efde 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -198,8 +198,7 @@ void PackageManagerImpl::initActivationLayer( dbName = m_registrationData_expanded + OUSTR("/extensions.db"); } //The data base can always be written because it it always in the user installation - m_activePackagesDB.reset( - new ActivePackages( dbName, false ) ); + m_activePackagesDB.reset( new ActivePackages( dbName ) ); if (! m_readOnly && ! m_context.equals(OUSTR("bundled"))) { |