Merge pull request #597 from deneb-alpha/susemanager-release_ServerInspectData

Do not print an error if /etc/susemanager-release does not exist

Author: deneb-alpha

shared/utils/serverinspector.go

@@ -24,7 +24,7 @@ func NewServerInspector(scriptDir string) ServerInspector {
 				"cat /etc/*release | grep 'Uyuni release' | cut -d ' ' -f3 || true"),
 			types.NewInspectData(
 				"suse_manager_release",
-				`sed 's/.*(\([0-9.]\+\).*/\1/g' /etc/susemanager-release || true`),
+				`[ -f /etc/susemanager-release ] && sed 's/.*(\([0-9.]\+\).*/\1/g' /etc/susemanager-release || true`),
 			types.NewInspectData(
 				"fqdn",
 				`sed -n '/^java\.hostname/{s/^java\.hostname[[:space:]]*=[[:space:]]*\(.*\)/\1/;p}' /etc/rhn/rhn.conf || true`),

shared/utils/serverinspector_test.go

@@ -26,7 +26,7 @@ func TestServerInspectorGenerate(t *testing.T) {
 	expected := `#!/bin/bash
 # inspect.sh, generated by mgradm
 echo "uyuni_release=$(cat /etc/*release | grep 'Uyuni release' | cut -d ' ' -f3 || true)" >> ` + dataPath + `
-echo "suse_manager_release=$(sed 's/.*(\([0-9.]\+\).*/\1/g' /etc/susemanager-release || true)" >> ` + dataPath + `
+echo "suse_manager_release=$([ -f /etc/susemanager-release ] && sed 's/.*(\([0-9.]\+\).*/\1/g' /etc/susemanager-release || true)" >> ` + dataPath + `
 echo "fqdn=$(sed -n '/^java\.hostname/{s/^java\.hostname[[:space:]]*=[[:space:]]*\(.*\)/\1/;p}' /etc/rhn/rhn.conf || true)" >> ` + dataPath + `
 echo "current_pg_version=$((psql -V | awk '{print $3}' | cut -d. -f1) || true)" >> ` + dataPath + `
 echo "current_pg_version_not_migrated=$((test -e /var/lib/pgsql/data/data/PG_VERSION && cat /var/lib/pgsql/data/data/PG_VERSION) || true)" >> ` + dataPath + `

uyuni-tools.changes.deneb-alpha.susemanager-release_ServerInspectData

@@ -0,0 +1,2 @@
+- Extract the version number from /etc/susemanager-release only if 
+  that config file exists