diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 11:46:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 11:47:14 +0100 |
| commit | 40d413ee4c88d4c2b68e0c373c6657f000705285 (patch) | |
| tree | 57815cdf5a23b2404a668b4c6cb044fa16b8d889 /desktop | |
| parent | 0b4ba827060757ee0ce23030bc8e25b5ddb9581f (diff) | |
Move flag file extensions/bundled/buildid -> extensions/buildid
...it does not only control bundled extensions.
Change-Id: Idc4c9d3c6788fc77e90aa2478d50f2b0151a1238
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ecfd32e0f6b9..7177e49d02b0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -206,9 +206,9 @@ void removeTree(OUString const & url) { // com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files // contained data nevertheless. // -// When a LO upgrade is detected (i.e., no user/extensions/bundled/buildid or -// one containing an old build ID), then user/extensions/bundled, -// user/extensions/shared, and user/uno_packages/cache/registry/ +// When a LO upgrade is detected (i.e., no user/extensions/buildid or one +// containing an old build ID), then user/extensions and +// user/uno_packages/cache/registry/ // com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are // removed. That should prevent any problems starting the service manager due // to old junk. Later on in Desktop::SynchronizeExtensionRepositories, the @@ -228,8 +228,7 @@ bool cleanExtensionCache() { "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/extensions"); rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure - OUString bundledDir = extDir + "/bundled"; - OUString buildIdFile(bundledDir + "/buildid"); + OUString buildIdFile(extDir + "/buildid"); osl::File fr(buildIdFile); osl::FileBase::RC rc = fr.open(osl_File_OpenFlag_Read); switch (rc) { @@ -274,10 +273,10 @@ bool cleanExtensionCache() { SAL_WARN_IF( rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop", "cannot remove file " << userRcFile << ": " << +rc); - rc = osl::Directory::createPath(bundledDir); + rc = osl::Directory::createPath(extDir); SAL_WARN_IF( rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop", - "cannot create path " << bundledDir << ": " << +rc); + "cannot create path " << extDir << ": " << +rc); osl::File fw(buildIdFile); rc = fw.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); if (rc != osl::FileBase::E_None) { |