Changeset 2719

Timestamp:

Oct 31, 2016, 1:04:06 PM (3 years ago)

Author:

daduve

Message:

diversions modified

Location:

home-linker/trunk/fuentes/debian

Files:

• home-linker.preinst (modified) (1 diff)
• home-linker.prerm (modified) (1 diff)

home-linker/trunk/fuentes/debian/home-linker.preinst

@@ -20 +20 @@
     upgrade)
         if dpkg --compare-versions "$2" lt 0.18; then
-           dpkg-divert --package home-linker --remove --rename --divert /etc/lightdm/lightdm.conf.diverted /etc/lightdm/lightdm.conf
-        fi
+           if [ ! -f /etc/lightdm/lightdm.conf.diverted ]; then
+                dpkg-divert --package home-linker --remove --rename --divert /etc/lightdm/lightdm.conf.diverted /etc/lightdm/lightdm.conf
+           fi
+        fi
     ;;
 

home-linker/trunk/fuentes/debian/home-linker.prerm

@@ -20 +20 @@
 case "$1" in
     remove)
-        dpkg-divert --package home-linker --remove --rename --divert /usr/share/xdg-lliurex-dirs/xdg-user-dirs-update.diverted /usr/bin/xdg-user-dirs-update
+        if [ ! -f /usr/share/xdg-lliurex-dirs/xdg-user-dirs-update.diverted ]; then 
+                dpkg-divert --package home-linker --remove --rename --divert /usr/share/xdg-lliurex-dirs/xdg-user-dirs-update.diverted /usr/bin/xdg-user-dirs-update
+        fi
     ;;
     upgrade|deconfigure)