Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 102585 Details for
Bug 155993
gnome2-utils.eclass shouldn't access VDB CONTENTS
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gnome2.eclass.diff
gnome2.eclass.diff (text/plain), 2.04 KB, created by
Mike Kelly (RETIRED)
on 2006-11-23 01:55:49 UTC
(
hide
)
Description:
gnome2.eclass.diff
Filename:
MIME Type:
Creator:
Mike Kelly (RETIRED)
Created:
2006-11-23 01:55:49 UTC
Size:
2.04 KB
patch
obsolete
>Index: gnome2.eclass >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v >retrieving revision 1.75 >diff -u -b -B -r1.75 gnome2.eclass >--- gnome2.eclass 31 Oct 2006 17:08:44 -0000 1.75 >+++ gnome2.eclass 23 Nov 2006 09:53:05 -0000 >@@ -110,13 +110,9 @@ > > einfo "Installing GNOME 2 GConf schemas" > >- local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS" >- >- for F in $(grep "^obj /etc/gconf/schemas/.\+\.schemas\b" ${contents} | gawk '{print $2}' ); do >- if [[ -e "${F}" ]]; then >- # echo "DEBUG::gconf install ${F}" >- ${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null >- fi >+ for F in ${GNOME2_SCHEMAS}; do >+ [[ -e "/${F}" ]] || continue >+ ${GCONFTOOL_BIN} --makefile-install-rule "/${F}" 1>/dev/null > done > > # have gconf reload the new schemas >@@ -134,11 +130,9 @@ > > einfo "Uninstalling GNOME 2 GConf schemas" > >- local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS" >- >- for F in $(grep "obj /etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do >- # echo "DEBUG::gconf install ${F}" >- ${GCONFTOOL_BIN} --makefile-uninstall-rule ${F} 1>/dev/null >+ for F in ${GNOME2_SCHEMAS}; do >+ [[ -e "/${F}" ]] || continue >+ ${GCONFTOOL_BIN} --makefile-uninstall-rule "/${F}" 1>/dev/null > done > fi > } >@@ -157,8 +151,7 @@ > return > fi > >- if ! grep -q "obj /usr/share/icons" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS >- then >+ if [[ -n "${GNOME2_HAS_ICONS}" ]] ; then > debug-print "No items to update" > > # We are done successfully >@@ -274,6 +267,13 @@ > fi > } > >+gnome2_pkg_preinst() { >+ pushd "${D}" 1>/dev/null >+ export GNOME2_SCHEMAS=etc/gconf/schemas/*schemas >+ [[ -d "${D}"/usr/share/icons/ ]] && export GNOME2_HAS_ICONS="yes" >+ popd 1>/dev/null >+} >+ > gnome2_pkg_postinst() { > gnome2_gconf_install > gnome2_scrollkeeper_update >@@ -293,4 +293,4 @@ > gnome2_icon_cache_update > } > >-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm >+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
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 155993
:
102582
|
102585
|
113025
|
113208
|
113209
|
113217
|
115655
|
117982
|
142783
|
142944