[SRU][Focal/-meta][PATCH] UBUNTU: Prevent errors when primary control files are not present

Juerg Haefliger juerg.haefliger at canonical.com
Wed Jan 29 13:57:23 UTC 2020


Some control files are not present for non-primary packages, so prevent
errors in that case.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index bccbd82a73a0..ad3e0948411f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ endif
 
 control_files := debian/control.common
 # control files only wanted for the primary variant
-primary_control_files := debian/control.d/primary $(shell LC_ALL=C ls -d debian/control.d/transitionals-*)
+primary_control_files := $(shell LC_ALL=C ls -d debian/control.d/{primary,transitionals-*} 2>/dev/null)
 ifneq ($(filter --,$(variants)),)
 	control_files += $(primary_control_files)
 endif
-- 
2.20.1




More information about the kernel-team mailing list