[PATCH] Change in core[libreoffice-4-0]: fdo#58909: Missing BAK_EXTENSIONS bootstrap variable

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1626

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/1626/1

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."

(cherry picked from commit 8dd405d32cb331818dc8f9bd1af3c5a074100f0f)
Conflicts:
        desktop/source/deployment/manager/dp_manager.cxx

Change-Id: Ie73ce50b6c26bbee6f3b7230a4d163715180ef52
---
M desktop/source/deployment/manager/dp_manager.cxx
M scp2/source/ooo/common_brand.scp
M scp2/source/ooo/profileitem_ooo.scp
3 files changed, 18 insertions(+), 1 deletion(-)



diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index ba67f9e..b9949df 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -398,7 +398,7 @@
             "vnd.sun.star.expand:$BAK_EXTENSIONS");
         that->m_registryCache = OUSTR(
             "vnd.sun.star.expand:$BAK_EXTENSIONS/registry");
-        stamp = OUSTR("vnd.sun.star.expand:$BAK_EXTENSIONS/stamp.sys");
+        stamp = OUSTR("$BAK_EXTENSIONS");
     }
 
     else if (! context.matchAsciiL(
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7ba7e76..0c21df8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1198,6 +1198,14 @@
     Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BAK_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 69ca5c6..abe5df4 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -166,6 +166,15 @@
     Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) 
":UserInstallation}/user/extensions/tmp";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BAK_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) 
":UserInstallation}/user/extensions/bak";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;

-- 
To view, visit https://gerrit.libreoffice.org/1626
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie73ce50b6c26bbee6f3b7230a4d163715180ef52
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>