[elbe-devel] [PATCH v2 14/15] dbsfed.xsd elbeproject: change <norecommend /> to <install-recommends />
Torben Hohn
torben.hohn at linutronix.de
Thu May 16 09:05:35 CEST 2019
<norecommend /> was broken and did the opposite since its introduction.
This shall not be fixed silently, because it would silently change
installed packages. Remove <norecommend /> and replace it with
<install-recommends />
Note that the norecommend flag is now evaluated correctly, so its
correct that norecommend is inverted <install-recommends /> now.
<install-recommends /> still retains the original behaviour <norecommdn>
in elbe v7.
Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
elbepack/elbeproject.py | 2 +-
schema/dbsfed.xsd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index e5bc150a1..073bfb15a 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -799,7 +799,7 @@ class ElbeProject (object):
env = self.buildenv
if norecommend is None:
- norecommend = self.xml.prj.has('norecommend'),
+ norecommend = not self.xml.prj.has('install-recommends'),
if env.arch == "default":
arch = self.arch
diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
index 333c0a8bb..eb42271ae 100644
--- a/schema/dbsfed.xsd
+++ b/schema/dbsfed.xsd
@@ -827,10 +827,10 @@
</documentation>
</annotation>
</element>
- <element name="norecommend" type="rfs:string" minOccurs="0">
+ <element name="install-recommend" type="rfs:string" minOccurs="0">
<annotation>
<documentation>
- Turn off the installation of recommended Packages.
+ Activate the installation of recommended Packages.
</documentation>
</annotation>
</element>
--
2.11.0
More information about the elbe-devel
mailing list