[git] 2nd invitation to include file with git add -A

oe-alliance · Jan 10, 2018 · 246cf30 · 246cf30
1 parent 6ff3660
commit 246cf30
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/...ecipes-devtools/opkg/opkg/0003-Relax_checks_for_existing_dirs_to_allow_symlinks_too.patch b/...ecipes-devtools/opkg/opkg/0003-Relax_checks_for_existing_dirs_to_allow_symlinks_too.patch
@@ -0,0 +1,14 @@
+--- a/libopkg/opkg_install.c	2018-01-10 04:51:25.000000000 +0100
++++ b/libopkg/opkg_install.c	2018-01-10 05:01:00.829598878 +0100
+@@ -451,9 +451,10 @@
+             pkg_t *owner;
+             pkg_t *obs;
+             int existing_is_dir = file_is_dir(filename);
++            int existing_is_lnk = file_is_symlink(filename);
+
+             /* OK if both the existing file and new file are directories. */
+-            if (existing_is_dir && S_ISDIR(file_info->mode)) {
++            if (existing_is_lnk || (existing_is_dir && S_ISDIR(file_info->mode))) {
+                 continue;
+             } else if (existing_is_dir || S_ISDIR(file_info->mode)) {
+                 /* Can't mix directory and non-directory.  For normal files,