From 291589ecc1ce237b5e43d28cfd890305d815fc89 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Feb 2009 04:09:09 +0100
Subject: allow overwriting of process properties with environment variables

---
 src/pulsecore/proplist-util.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/pulsecore/proplist-util.c')

diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 522c7afe..c09c8af5 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -65,11 +65,6 @@ void pa_init_proplist(pa_proplist *p) {
 
                 k = pa_xstrndup(*e+11, kl);
 
-                if (pa_proplist_contains(p, k)) {
-                    pa_xfree(k);
-                    continue;
-                }
-
                 pa_proplist_sets(p, k, *e+11+kl+1);
                 pa_xfree(k);
             }
@@ -80,7 +75,7 @@ void pa_init_proplist(pa_proplist *p) {
         pa_proplist *t;
 
         if ((t = pa_proplist_from_string(pp))) {
-            pa_proplist_update(p, PA_UPDATE_MERGE, t);
+            pa_proplist_update(p, PA_UPDATE_REPLACE, t);
             pa_proplist_free(t);
         }
     }
-- 
cgit