From 7274357565db9a327d01fce600eaa9ed38ab2d94 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 10 Dec 2017 00:39:39 -0600 Subject: [PATCH] libpkgconf: fragment: track merged fragments, as they should never be quoted --- libpkgconf/fragment.c | 1 + libpkgconf/libpkgconf.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libpkgconf/fragment.c b/libpkgconf/fragment.c index ef749fc..389b436 100644 --- a/libpkgconf/fragment.c +++ b/libpkgconf/fragment.c @@ -173,6 +173,7 @@ pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const free(parent->data); parent->data = newdata; + parent->merged = true; /* use a copy operation to force a dedup */ pkgconf_node_delete(&parent->iter, list); diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index 6357450..f823c9c 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -78,6 +78,8 @@ struct pkgconf_fragment_ { char type; char *data; + + bool merged; }; struct pkgconf_dependency_ {