Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 572452 Details for
Bug 683104
sys-apps/smartmontools: Merging new version doesn't update existing drivedb.h
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for sys-apps/smartmontools-7.0-r1 ebuild
smartmontools-7.0-r1_update-drivedb-using-timestamp.patch (text/plain), 2.29 KB, created by
Will Simoneau
on 2019-04-11 16:16:54 UTC
(
hide
)
Description:
patch for sys-apps/smartmontools-7.0-r1 ebuild
Filename:
MIME Type:
Creator:
Will Simoneau
Created:
2019-04-11 16:16:54 UTC
Size:
2.29 KB
patch
obsolete
>--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild 2019-04-08 18:39:48.000000000 -0400 >+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild 2019-04-11 11:48:17.380570024 -0400 >@@ -73,6 +73,7 @@ > > src_install() { > local db_path="/var/db/${PN}" >+ insopts -m0644 -p # preserve timestamps > > if use daemon; then > default >@@ -119,32 +120,24 @@ > if use daemon || use update_drivedb; then > local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h" > local db_path="${EPREFIX%/}/var/db/${PN}" >+ local real_db_file="${db_path}/drivedb.h" > >- if [[ ! -f "${db_path}/drivedb.h" ]] ; then >- # No initial database found >- cp "${initial_db_file}" "${db_path}" || die >- einfo "Default drive database which was shipped with this release of ${PN}" >- einfo "has been installed to '${db_path}'." >- else >- ewarn "WARNING: There's already a drive database in '${db_path}'!" >- ewarn "Because we cannot determine if this database is untouched" >- ewarn "or was modified by the user you have to manually update the" >- ewarn "drive database:" >- ewarn "" >- ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this" >- ewarn " release which can be found in '${initial_db_file}', i.e." >- ewarn "" >- ewarn " cp \"${initial_db_file}\" \"${db_path}\"" >- ewarn "" >- ewarn "b) Run the following command as root:" >- ewarn "" >- ewarn " /usr/sbin/update-smart-drivedb" >- >- if ! use update_drivedb ; then >- ewarn "" >- ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" >- ewarn "with USE='update_drivedb'." >+ if [[ -L "${real_db_file}" ]]; then >+ ewarn "Preserving existing symlink '${real_db_file}'." >+ elif [[ -e "${real_db_file}" ]]; then >+ if [[ "${initial_db_file}" -nt "${real_db_file}" ]]; then >+ einfo "This release of ${PN} ships with a newer version of" >+ einfo "drivedb.h than the one currently installed." >+ einfo "Installing updated '${real_db_file}'." >+ cp -p "${initial_db_file}" "${db_path}/" || die >+ else >+ einfo "The drivedb.h shipped with this release of ${PN} is no" >+ einfo "newer than the existing '${real_db_file}'." >+ einfo "Preserving existing drivedb.h." > fi >+ else >+ # If there is no existing drivedb.h, just silently install ours. >+ cp -p "${initial_db_file}" "${db_path}/" || die > fi > fi > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 683104
:
572452
|
684732
|
684816
|
766807