From 19ab43ef49acfea9ff03003788c5ce1ca2183506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?=
 <hector.oron@collabora.co.uk>
Date: Thu, 8 Sep 2016 19:08:30 +0200
Subject: [PATCH] sanity-check: stop allowing os-release ID to be ubuntu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

os-release pretended we were Ubuntu for a while, to make packages
with different build steps for Debian and Ubuntu follow Ubuntu-like
code paths. This has now been fixed.

Reviewed-by: Simon McVittie <smcv@collabora.co.uk>
Signed-off-by: Héctor Orón Martínez <hector.oron@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D4272
---
 common/sanity-check | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/sanity-check b/common/sanity-check
index 8573af3..18d153d 100755
--- a/common/sanity-check
+++ b/common/sanity-check
@@ -49,10 +49,7 @@ test -S /run/user/$(id -u user)/bus || fail user-bus-is-up
 test -e /etc/debian_version || fail has-debian_version
 cat /etc/os-release || fail os-release
 grep -E '^NAME=("?)Apertis\1$' /etc/os-release || fail os-release-name
-# This should really test for apertis, but that would currently
-# fail - see https://phabricator.apertis.org/T2117 - so they also
-# allow Ubuntu
-grep -E '^ID=("?)(apertis|ubuntu)\1$' /etc/os-release || fail os-release-id
+grep -E '^ID=("?)apertis\1$' /etc/os-release || fail os-release-id
 
 if ! test -S /run/user/$(id -u user)/wayland-0; then
     common/run-test-in-systemd --user=user --name=x11-works -- xterm -e /bin/true
-- 
GitLab