This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=68403847844bfb5cb118334ae384c360a7e6871d

commit 68403847844bfb5cb118334ae384c360a7e6871d
Author: Guillem Jover <[email protected]>
AuthorDate: Thu Dec 25 00:39:38 2025 +0100

    Dpkg::BuildProfiles: Remove the parser workaround now that dh-exec is fixed
    
    This was added in commit 1901b52bb8d6fbd2479232fe8fc91fe47b1235c1,
    but we can revert it now.
    
    Add a versioned Breaks on the dh-exec versions that the stricter parser
    makes no longer work.
---
 debian/control                | 3 +++
 scripts/Dpkg/BuildProfiles.pm | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 386831e1e..cd1829d67 100644
--- a/debian/control
+++ b/debian/control
@@ -226,6 +226,9 @@ Breaks:
 # Uses required SOP features, w/o requiring a hard dependency on pgpainless.
  pgpainless-cli (<< 1.3.13~),
  libsop-java-java (<< 4.0.7~),
+# Uses the Dpkg::BuildProfiles in an incorrect way, which broke when making
+# the parser more strict.
+ dh-exec (<< 0.31~),
 Description: Dpkg perl modules
  This package provides the perl modules used by the scripts
  in dpkg-dev. They cover a wide range of functionality. Among them
diff --git a/scripts/Dpkg/BuildProfiles.pm b/scripts/Dpkg/BuildProfiles.pm
index f9d4cd6c2..3678a0717 100644
--- a/scripts/Dpkg/BuildProfiles.pm
+++ b/scripts/Dpkg/BuildProfiles.pm
@@ -142,12 +142,6 @@ It will die on invalid syntax.
 
 sub parse_build_profiles($string)
 {
-    # XXX: Workaround for incorrect usage of the API in dh-exec, remove once
-    # the usage is fixed.
-    if (build_profile_is_invalid($string)) {
-        $string = "<$string>";
-    }
-
     if (build_profile_is_invalid($string)) {
         error(g_("'%s' is not a valid build profile restriction formula"),
               $string);

-- 
Dpkg.Org's dpkg

Reply via email to