Seriously ? That's how you deduplicate content ? Are you planning to add all the possible path on earth ? Use eina str split and check their is no duplicate for real, and remove that patch. Le 29 janv. 2015 13:44, "Samuel F. Baggen" <thanaterme...@gmail.com> a écrit :
> princeamd pushed a commit to branch master. > > > http://git.enlightenment.org/core/enlightenment.git/commit/?id=ae3410a0bad31c1850e845eab284540aadb8c65b > > commit ae3410a0bad31c1850e845eab284540aadb8c65b > Author: Thanatermesis <thanaterme...@gmail.com> > Date: Wed Dec 31 19:12:36 2014 +0100 > > Include /usr/local too in the no-duplication of XDG_DATA_DIRS > > @fix and improves the previous fix > > (cherry picked from commit e0dcab584bba0d62b21bafdbbeefae78ccccf3cb) > Signed-off-by: Deon Thomas <princeamd.el...@gmail.com> > --- > src/bin/e_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/bin/e_main.c b/src/bin/e_main.c > index 27eabb7..d2742f8 100644 > --- a/src/bin/e_main.c > +++ b/src/bin/e_main.c > @@ -127,8 +127,8 @@ _xdg_data_dirs_augment(void) > > s = getenv("XDG_DATA_DIRS"); > > - // if our prefix is already /usr we should not append /usr/share here > yet > - if (strcmp(p, "/usr") == 0) > + // don't add e_prefix path if it is already /usr or /usr/local > + if ((strcmp(p, "/usr") == 0) || (strcmp(p, "/usr/local") == 0)) > snprintf(newpath, sizeof(newpath), "%s", e_prefix_data_get()); > else > snprintf(newpath, sizeof(newpath), "%s:%s/share", > e_prefix_data_get(), p); > > -- > > > > ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
