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=6bfc419d97ef62e06ce33bfa7b55ec0abe417536

commit 6bfc419d97ef62e06ce33bfa7b55ec0abe417536
Author: Guillem Jover <[email protected]>
AuthorDate: Sun Oct 9 12:27:59 2022 +0200

    libdpkg, dpkg: Switch triggers database to use reproducible package names
    
    For package name tracking in the triggers database, whether a package is
    Multi-Arch foreign not matching the current native architecture is not
    relevant, as there can only be one such package installed on the system.
    
    Closes: #990712
---
 lib/dpkg/triglib.c | 4 ++--
 src/trigger/main.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 2bf4b3810..e03554b99 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -380,7 +380,7 @@ trk_explicit_interest_change(const char *trig,  struct 
pkginfo *pkg,
        }
        if (signum > 0) {
                fprintf(file->fp, "%s%s\n",
-                       pkgbin_name(pkg, pkgbin, pnaw_nonambig),
+                       pkgbin_name(pkg, pkgbin, pnaw_same),
                        trig_dump_trigger_options(opts));
                empty = false;
        }
@@ -500,7 +500,7 @@ trig_file_interests_update(void)
 
        for (tfi = filetriggers.head; tfi; tfi = tfi->inoverall.next)
                fprintf(file->fp, "%s %s%s\n", trigh.namenode_name(tfi->fnn),
-                       pkgbin_name(tfi->pkg, tfi->pkgbin, pnaw_nonambig),
+                       pkgbin_name(tfi->pkg, tfi->pkgbin, pnaw_same),
                        trig_dump_trigger_options(tfi->options));
 
        atomic_file_sync(file);
diff --git a/src/trigger/main.c b/src/trigger/main.c
index e7d589644..0f22435da 100644
--- a/src/trigger/main.c
+++ b/src/trigger/main.c
@@ -141,7 +141,7 @@ parse_awaiter_package(void)
 
        /* Normalize the bypackage name if there was no error. */
        if (pkg)
-               bypackage = pkg_name(pkg, pnaw_nonambig);
+               bypackage = pkg_name(pkg, pnaw_same);
 
        return err.str;
 }

-- 
Dpkg.Org's dpkg

Reply via email to