On Fri, Jan 15, 2021 at 09:43:05PM +0100, Helmut Grohne wrote:
> Duh! I ran into this as well now. Thanks for filing it. I think the
> patch mostly explains itself. <.*> matches e.g. "<< 2:8) <!nocheck>
> <!noinsttest>" or "<< 2:8) <!nocheck> <!noinsttest>".
And I managed to miss the patch. Thanks Jessica.
Helmut
diff --minimal -Nru pbuilder-0.230.4/debian/changelog
pbuilder-0.230.4+nmu1/debian/changelog
--- pbuilder-0.230.4/debian/changelog 2019-04-02 11:32:38.000000000 +0200
+++ pbuilder-0.230.4+nmu1/debian/changelog 2021-01-15 22:46:35.000000000
+0100
@@ -1,3 +1,11 @@
+pbuilder (0.230.4+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix parsing of build-depends with version and profile restrictions.
+ (Closes: #961227)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 15 Jan 2021 22:46:35 +0100
+
pbuilder (0.230.4) unstable; urgency=medium
* createbuildenv:
diff --minimal -Nru pbuilder-0.230.4/pbuilder-satisfydepends-funcs
pbuilder-0.230.4+nmu1/pbuilder-satisfydepends-funcs
--- pbuilder-0.230.4/pbuilder-satisfydepends-funcs 2018-11-23
11:51:49.000000000 +0100
+++ pbuilder-0.230.4+nmu1/pbuilder-satisfydepends-funcs 2021-01-15
22:46:32.000000000 +0100
@@ -202,7 +202,7 @@
echo "$INSTALLPKG"
done |
# remove the restriction list and add " | " between entries
- sed 's/<.*>//; $,$! s/$/ |/' |
+ sed 's/<[^)(]*>//; $,$! s/$/ |/' |
xargs --no-run-if-empty
done |
# add ", " between entries
