diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-10 11:54:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-10 12:15:43 +0100 |
| commit | 8dd405d32cb331818dc8f9bd1af3c5a074100f0f (patch) | |
| tree | f6be6c8fd799eec3da109026d964abeac4f5245f /desktop/source/deployment/manager | |
| parent | fbd9b4b9977fc12d826a00f6c4b2c4563eb74ff7 (diff) | |
fdo#58909: Missing BAK_EXTENSIONS bootstrap variable
daeed90f4586eb9533041fb89bee163a5193596c "re-base on ALv2 code" had incorporated
from <http://svn.apache.org/viewvc?view=revision&revision=1172102> "imported
patch extensions_i117681.patch" the parts using BAK_EXTENSIONS in
desktop/source/deployment/manager/, but not the parts setting BAK_EXTENSIONS in
scp2/source/ooo/.
Also, setting the stamp for "bak" in PackageManagerImpl::create needed to be
adapted to bee742eb7a0d5dfe23e61d9ee49a29286de90256 "Fix sense of r/o detection
code, and clean up" and 61eeb689d7605a23c3e71c652b57ee65cf5b28dc "fix smoketest
- need to check read-only-ness of non-existent paths."
Change-Id: If7cc363b3cf21fd13fb467f5f672eda5312515c8
Diffstat (limited to 'desktop/source/deployment/manager')
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 89e46c9fab0a..87c107c08855 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -379,7 +379,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( that->m_activePackages = "vnd.sun.star.expand:$BAK_EXTENSIONS/extensions"; that->m_registrationData = "vnd.sun.star.expand:$BAK_EXTENSIONS"; that->m_registryCache = "vnd.sun.star.expand:$BAK_EXTENSIONS/registry"; - stamp = "vnd.sun.star.expand:$BAK_EXTENSIONS/stamp.sys"; + stamp = "$BAK_EXTENSIONS"; } else if (! context.match("vnd.sun.star.tdoc:/")) { |