diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 00:45:33 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 00:45:33 +0000 |
| commit | dc6a95bba0ba336329e396cd4c8b353ec2b18d90 (patch) | |
| tree | 9db9831c475cc18763dd729d1740578fdb47f227 /eclass/kde-functions.eclass | |
| parent | Add German translation, bug #175271 (diff) | |
| download | historical-dc6a95bba0ba336329e396cd4c8b353ec2b18d90.tar.gz historical-dc6a95bba0ba336329e396cd4c8b353ec2b18d90.tar.bz2 historical-dc6a95bba0ba336329e396cd4c8b353ec2b18d90.zip | |
postprocess_desktop_entries: Added a check for an existing desktop file in the destination directory before moving a potentially broken one from its legacy location. Fixes bug 180057.
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 638017a9c36c..596a4a988a25 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.152 2007/05/01 12:29:25 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.153 2007/05/28 00:45:33 philantrop Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -918,8 +918,10 @@ postprocess_desktop_entries() { if [[ -n ${desktop_entries} ]]; then for entry in ${desktop_entries} ; do - dodir ${PREFIX}/share/applications/kde - mv ${entry} ${D}${PREFIX}/share/applications/kde + if [[ ! -f ${D}${PREFIX}/share/applications/kde/$(basename ${entry}) ]]; then + dodir ${PREFIX}/share/applications/kde + mv ${entry} ${D}${PREFIX}/share/applications/kde + fi done fi fi |