From 26cdcb063b6f9422b7ffa4a187a762920e6a651d Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Wed, 30 Sep 2009 09:36:22 -0700 Subject: fix for bug 4969. on leaf nodes scan for '/' and don't make these values available to the partial commit status api (bug fix 4919). this approach will be revised in next release. --- src/common/unionfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 8721651..3f42e5b 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -1041,7 +1041,10 @@ dlist_test_func(GQuark key_id,gpointer data,gpointer user_data) // strcat(new_vn->_data._path,"/"); strcat(new_vn->_data._path,"/value:"); if (vn_parent->_config._def.multi == FALSE) { - strcat(new_vn->_data._path,(char*)g_quark_to_string(key_id)); + char *tmp = (char*)g_quark_to_string(key_id); + if (strchr(tmp,'/') == NULL) { + strcat(new_vn->_data._path,tmp); + } } } new_vn->_data._value = TRUE; -- cgit v1.2.3