aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2006-08-30 16:54:40 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2006-08-30 16:54:40 +0000
commit204850258cc0a97ca02d421ffc8f130c601886e1 (patch)
tree5584461436e16636d2d87c2d3417b40ba7286a32
parent8097b86c21dbdef82e8001974cbe8cdfa06c6df3 (diff)
downloadcommon-data-204850258cc0a97ca02d421ffc8f130c601886e1.tar
common-data-204850258cc0a97ca02d421ffc8f130c601886e1.tar.gz
common-data-204850258cc0a97ca02d421ffc8f130c601886e1.tar.bz2
common-data-204850258cc0a97ca02d421ffc8f130c601886e1.tar.xz
common-data-204850258cc0a97ca02d421ffc8f130c601886e1.zip
- update-menus doesn't do anything if DURING_INSTALL is set to 1
-rw-r--r--desktop-common-data.spec5
-rwxr-xr-xmenu/update-menus4
2 files changed, 8 insertions, 1 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index e09fdf1..223053d 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -3,7 +3,7 @@
Summary: Desktop common files
Name: desktop-common-data
Version: 2007
-Release: %mkrel 8
+Release: %mkrel 9
License: GPL
URL: http://www.mandrivalinux.com/
Group: System/Configuration/Other
@@ -192,6 +192,9 @@ rm -fr %buildroot
%changelog
+* Wed Aug 30 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-9mdv2007.0
+- update-menus doesn't do anything if DURING_INSTALL is set to 1
+
* Wed Aug 30 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-8mdv2007.0
- Add missing directory file for adventure (Mdv bug #24829)
- Add empty menu nodes for KDE in discovery menu
diff --git a/menu/update-menus b/menu/update-menus
index c03fde5..7baeb12 100755
--- a/menu/update-menus
+++ b/menu/update-menus
@@ -12,6 +12,10 @@ exit 0
VERBOSE=0
+if [ "$DURING_INSTALL" = "1" ]; then
+ exit 0
+fi
+
if [ "$UID" == "0" ]; then
USER_MENU=0
else