ALT Linux Bugzilla
– Attachment 15617 Details for
Bug 49544
find-package generates mismatched R: in merged-usr environment
New bug
|
Search
|
[?]
|
Help
Register
|
Log In
[x]
|
Forgot Password
Login:
[x]
|
EN
|
RU
[patch]
экспериментальный патч, с которым работает
file_49544.txt (text/plain), 786 bytes, created by
Arseny Maslennikov
on 2024-02-28 12:00:44 MSK
(
hide
)
Description:
экспериментальный патч, с которым работает
Filename:
MIME Type:
Creator:
Arseny Maslennikov
Created:
2024-02-28 12:00:44 MSK
Size:
786 bytes
patch
obsolete
>diff --git a/scripts/functions b/scripts/functions >index a879cd62d..1cfb1634e 100644 >--- a/scripts/functions >+++ b/scripts/functions >@@ -130,10 +130,20 @@ CanonPath() > if [ -L "$f1" ]; then > local d > d=$(dirname -- "$f1") >- d=$(readlink -vm -- "$d") >+ # Do not resolve symbolic links for bin catalogs that be merged. >+ # For more information about usrmerge: https://altlinux.org/Usrmerge. >+ case "$d" in >+ /bin|/sbin) ;; >+ *) d=$(readlink -vm -- "$d") ;; >+ esac > f2="${d%/}/${f1##*/}" > else > f2=$(readlink -vm -- "$f1") >+ # Strip /usr for bin catalogs if it was added due to resolving symbolic >+ # link. >+ case "$f1" in >+ /bin/*|/sbin/*) f2="${f2#/usr}";; >+ esac > fi > [ "$f1" = "$f2" ] || Verbose "CanonPath2: $f1 -> $f2" > echo "$f2"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=15617">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 49544
: 15617
