summaryrefslogtreecommitdiff
path: root/scp2/source/ooo
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-10 11:54:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-10 12:15:43 +0100
commit8dd405d32cb331818dc8f9bd1af3c5a074100f0f (patch)
treef6be6c8fd799eec3da109026d964abeac4f5245f /scp2/source/ooo
parentfbd9b4b9977fc12d826a00f6c4b2c4563eb74ff7 (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 'scp2/source/ooo')
-rw-r--r--scp2/source/ooo/common_brand.scp8
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp9
2 files changed, 17 insertions, 0 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index eae79e718bce..025ad7f5346a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1180,6 +1180,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
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 69ca5c648c60..abe5df4ce4fc 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -166,6 +166,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
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;