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=83ceb3f325ff208f0ed86ccad39ea256d2ff0194

commit 83ceb3f325ff208f0ed86ccad39ea256d2ff0194 (HEAD -> main)
Author: Guillem Jover <[email protected]>
AuthorDate: Sat Mar 26 11:58:38 2022 +0100

    Dpkg::Control::Fields: Remove duplicate *Built-Using from field order lists
    
    These fields got refactored into a common dependency fields list, but
    the Built-Using field did not get removed from the original order lists,
    and ended up being duplicated. The Static-Built-Using field got added
    next to each previous Built-Using instance, which ended up being
    duplicated too.
    
    Fixes: commit f0fa8190fe02bb9db8168ae6a67f592f135b06c2
    Reported-by: David Kalnischkies <[email protected]>
---
 scripts/Dpkg/Control/FieldsCore.pm | 4 ----
 scripts/t/Dpkg_Control_Fields.t    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/scripts/Dpkg/Control/FieldsCore.pm 
b/scripts/Dpkg/Control/FieldsCore.pm
index eaa7615cc..3247d2911 100644
--- a/scripts/Dpkg/Control/FieldsCore.pm
+++ b/scripts/Dpkg/Control/FieldsCore.pm
@@ -755,8 +755,6 @@ our %FIELD_ORDER = (
             package-type
             source
             version
-            built-using
-            static-built-using
             kernel-version
             built-for-profiles
             auto-built-package
@@ -816,8 +814,6 @@ our %FIELD_ORDER = (
             package-type
             source
             version
-            built-using
-            static-built-using
             kernel-version
             built-for-profiles
             auto-built-package
diff --git a/scripts/t/Dpkg_Control_Fields.t b/scripts/t/Dpkg_Control_Fields.t
index cc7e838c0..1c699e373 100644
--- a/scripts/t/Dpkg_Control_Fields.t
+++ b/scripts/t/Dpkg_Control_Fields.t
@@ -182,8 +182,6 @@ my %fields = (
                 Package-Type
                 Source
                 Version
-                Built-Using
-                Static-Built-Using
                 Kernel-Version
                 Built-For-Profiles
                 Auto-Built-Package
@@ -246,8 +244,6 @@ my %fields = (
                 Package-Type
                 Source
                 Version
-                Built-Using
-                Static-Built-Using
                 Kernel-Version
                 Built-For-Profiles
                 Auto-Built-Package

-- 
Dpkg.Org's dpkg

Reply via email to