@pmatilai commented on this pull request.
> @@ -633,7 +633,17 @@ assert(otherFi != NULL);
rConflicts = handleColorConflict(ts, fs, fi, i,
otherFs, otherFi, otherFileNum);
- if (rConflicts && reportConflicts) {
+ /*
+ * This may be a false positive (two separate files) if a
+ * symlink is being replaced by a directory in one of these two
+ * paths. This check extends the one for removal conflicts in
+ * handleInstInstalledFile().
+ */
+ int reportThis = !(p == otherTe &&
+ rpmtsFlags(ts) & RPMTRANS_FLAG_TEST &&
+ rpmteHaveTransScript(p, RPMTAG_PRETRANS));
Hmm. Wouldn't this now apply the heuristic to *all* file conflicts on newly
installed files? The "removal conflict" case specifically looks at the dir <->
link cases and the %pretrans heuristic should only ever be applied to those
here too.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/1684#discussion_r634384676_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
