search

mika / jenkins-debian-glue

Scripts for Debian package/repository handling inside Jenkins
MIT License
131 stars 91 forks source link

build-and-provide-package: fix debian/control lookup for non-native pkgs #228

Closed peat-psuwit closed 4 years ago

peat-psuwit commented 4 years ago

Commit 5d465bf537f38a083de61d6ff1815c9044cef352 (build-and-provide- package: Look only for the "real" debian/control file) fixes debian/ control lookup for native packages with multiple debian/control files. However, it completely breaks the non-native case, as the regex always expect 1 level of subdirectory.

This commit edit the regex to make the 1 level of subdirectory part optional. This make it works on both native and non-native packages.

This has been tested on the original offending package (autopkgtest) to make sure no regression occurs.

mika commented 4 years ago

Oh, wondering how this went unnoticed, thanks for the fix and PR, just merged!