[Libosinfo] [osinfo-db PATCH v2 14/29] ubuntu, jeos: Tune extra installed softwares

[Fabiano Fidêncio]

Seems that although openssh-server is present in all ubuntu servers,
python-software-properties is not.

For newer versions of ubuntu, let's just install
python3-software-properties.

For 12.04, let's install python-software-properties.

For 12.10, let's avoid installing as it'd raise an error during
installation.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../ubuntu.com/ubuntu-preseed-jeos.xml.in            | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
index 1e61754..79cdb8d 100644
--- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
+++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
@@ -82,7 +82,17 @@ d-i passwd/root-password-again password <xsl:value-of select="config/admin-passw
 
 tasksel tasksel/first multiselect standard
 d-i pkgsel/include/install-recommends boolean true
-d-i pkgsel/include string openssh-server python-software-properties
+d-i pkgsel/include string openssh-server
+<xsl:choose>
+    <xsl:when test="os/version < 13.10">
+      <xsl:if test="os/version = 12.04">
+d-i pkgsel/include string python-software-properties
+      </xsl:if>
+  </xsl:when>
+  <xsl:otherwise>
+d-i pkgsel/include string python3-software-properties
+  </xsl:otherwise>
+</xsl:choose>
 
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
-- 
2.20.1