[SRU,Focal/-meta] UBUNTU: Prevent errors when primary control files are not present
diff mbox series

Message ID 20200129135723.12967-1-juergh@canonical.com
State New
Headers show
Series
  • [SRU,Focal/-meta] UBUNTU: Prevent errors when primary control files are not present
Related show

Commit Message

Juerg Haefliger Jan. 29, 2020, 1:57 p.m. UTC
Some control files are not present for non-primary packages, so prevent
errors in that case.

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

Comments

Seth Forshee Jan. 29, 2020, 2:38 p.m. UTC | #1
On Wed, Jan 29, 2020 at 02:57:23PM +0100, Juerg Haefliger wrote:
> Some control files are not present for non-primary packages, so prevent
> errors in that case.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>

Applied, thanks!

Patch
diff mbox series

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