Date: Wed, 23 Sep 2020 15:37:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549742 - head/devel/glib20/files Message-ID: <202009231537.08NFbc5w098139@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Sep 23 15:37:37 2020 New Revision: 549742 URL: https://svnweb.freebsd.org/changeset/ports/549742 Log: Fix bad patch Modified: head/devel/glib20/files/patch-glib_gfileutils.c Modified: head/devel/glib20/files/patch-glib_gfileutils.c ============================================================================== --- head/devel/glib20/files/patch-glib_gfileutils.c Wed Sep 23 15:35:28 2020 (r549741) +++ head/devel/glib20/files/patch-glib_gfileutils.c Wed Sep 23 15:37:37 2020 (r549742) @@ -12,31 +12,3 @@ Index: glib/gfileutils.c { int errno_save = errno; if (errno != ENOENT || !p) -https://gitlab.gnome.org/GNOME/glib/merge_requests/832 - -Index: glib/gfileutils.c ---- glib/gfileutils.c.orig -+++ glib/gfileutils.c -@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname, - - if (!g_file_test (fn, G_FILE_TEST_EXISTS)) - { -- if (g_mkdir (fn, mode) == -1 && errno != EEXIST) -+ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1))) - { - int errno_save = errno; - if (errno != ENOENT || !p) -https://gitlab.gnome.org/GNOME/glib/merge_requests/832 - -Index: glib/gfileutils.c ---- glib/gfileutils.c.orig -+++ glib/gfileutils.c -@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname, - - if (!g_file_test (fn, G_FILE_TEST_EXISTS)) - { -- if (g_mkdir (fn, mode) == -1 && errno != EEXIST) -+ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1))) - { - int errno_save = errno; - if (errno != ENOENT || !p)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231537.08NFbc5w098139>