summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2011-03-03 17:01:11 +0100
committerJoachim Lingner <jl@openoffice.org>2011-03-03 17:01:11 +0100
commit7df9c3ee7869860e42d50a9fbb6f3ee46682dd75 (patch)
tree202220b7e0f1243f7997ba1259df380058f96922
parent301719567fe1c26c923e47c4ed60ce04e3a54b78 (diff)
#i117186# call unopkg sync when building type installed or archive with the proper arguments, remove assertion from framework for the case that there is no user installation.
-rwxr-xr-x[-rw-r--r--]framework/source/services/substitutepathvars.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 4e38983ba7..9936f02693 100644..100755
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1170,12 +1170,12 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
}
aState = utl::Bootstrap::locateUserData( sVal );
+ //There can be the valid case that there is no user installation. For example, "unopkg sync"
+ //is currently (OOo3.4) run as part of the setup. Then no user installation is required.
+ //Therefore we do not assert here.
if( aState == ::utl::Bootstrap::PATH_EXISTS ) {
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ] = ConvertOSLtoUCBURL( sVal );
}
- else {
- LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for userpath");
- }
// Set $(inst), $(instpath), $(insturl)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];