mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create missing parent dirs when checking for r/o dir

Browse Source 
...can happen when 'unopkg add' is called before soffice had ever been run, so
UserInstallation isn't populated yet

Change-Id: I0c6b9444f196da5ad5a32cc90f2e1e2a5dbd0f58
This commit is contained in:
Stephan Bergmann
2017-01-31 11:44:20 +01:00
parent 9f440258b6
commit b01ec28b6d
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
desktop/source/deployment/manager/dp_manager.cxx
View File

@@ -30,6 +30,7 @@
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <tools/urlobj.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/security.hxx> #include <osl/security.hxx>
@@ -278,14 +279,32 @@ void PackageManagerImpl::initRegistryBackends()
m_xComponentContext ) ); m_xComponentContext ) );
} }
namespace {
osl::FileBase::RC createDirectory(OUString const & url) {
auto e = osl::Directory::create(url);
if (e != osl::FileBase::E_NOENT) {
return e;
}
INetURLObject o(url);
if (!o.removeSegment()) {
return osl::FileBase::E_INVAL; // anything but E_None/E_EXIST
}
e = createDirectory(o.GetMainURL(INetURLObject::DecodeMechanism::NONE));
if (e != osl::FileBase::E_None && e != osl::FileBase::E_EXIST) {
return e;
}
return osl::Directory::create(url);
}
// this overcomes previous rumors that the sal API is misleading // this overcomes previous rumors that the sal API is misleading
// as to whether a directory is truly read-only or not // as to whether a directory is truly read-only or not
static bool isMacroURLReadOnly( const OUString &rMacro ) bool isMacroURLReadOnly( const OUString &rMacro )
{ {
OUString aDirURL( rMacro ); OUString aDirURL( rMacro );
::rtl::Bootstrap::expandMacros( aDirURL ); ::rtl::Bootstrap::expandMacros( aDirURL );
::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL ); ::osl::FileBase::RC aErr = createDirectory( aDirURL );
if ( aErr == ::osl::FileBase::E_None ) if ( aErr == ::osl::FileBase::E_None )
return false; // it will be writeable return false; // it will be writeable
if ( aErr != ::osl::FileBase::E_EXIST ) if ( aErr != ::osl::FileBase::E_EXIST )
@@ -313,6 +332,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro )
return bError; return bError;
} }
}
Reference<deployment::XPackageManager> PackageManagerImpl::create( Reference<deployment::XPackageManager> PackageManagerImpl::create(
Reference<XComponentContext> const & xComponentContext, Reference<XComponentContext> const & xComponentContext,