[Pkg-ocaml-maint-commits] r3521 - in /trunk/packages/mldonkey/trunk/debian: changelog mldonkey-server.postinst mldonkey-server.postrm

[smimram at users.alioth.debian.org]

Author: smimram
Date: Wed Jan 17 00:07:47 2007
New Revision: 3521

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3521
Log:
Not adding mldonkey users in postinst anymore.

Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3521&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Wed Jan 17 00:07:47 2007
@@ -2,9 +2,10 @@
 
   * Added avoid-duplicate-sending to fix a serious bug which lead mldonkey to
     uploading data blocks twice to eMule clients, closes: #406247.
-  * Added useradd.dpatch to be able to add users using useradd command and
-    use it in postinst, closes: #397497. Not installing mldonkey_users anymore
-    since it is not compatible with the new users.ini format.
+  * Added useradd.dpatch to be able to add users using useradd command. However
+    adding mldonkey users in postinst is a broken behaviour; not doing it
+    anymore, closes: #397497. Not installing mldonkey_users anymore since it is
+    not compatible with the new users.ini format.
   * Change uid of mldonkey on startup, closes: #405173.
 
  -- Samuel Mimram <smimram at debian.org>  Wed, 29 Nov 2006 00:10:25 +0000

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst?rev=3521&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst Wed Jan 17 00:07:47 2007
@@ -84,8 +84,9 @@
       db_get mldonkey-server/max_hard_download_rate
       max_hard_download_rate="$RET"
 
-      db_get mldonkey-server/password
-      password="$RET"
+#      db_get mldonkey-server/password
+#      password="$RET"
+      password=""
 
       db_get mldonkey-server/max_alive
       max_alive="$RET"
@@ -200,11 +201,11 @@
       # Users.ini #
       #############
 
-        if [ -n "$password" ]; then
-            $DEBUG && echo -n "Registering admin password in $new_mldonkey_dir/users.ini: "
-            /usr/bin/mlnet -useradd "admin $password"
-            $DEBUG && echo "done."
-        fi
+#        if [ -n "$password" ]; then
+#            $DEBUG && echo -n "Registering admin password in $new_mldonkey_dir/users.ini: "
+#            /usr/bin/mlnet -useradd "admin $password"
+#            $DEBUG && echo "done."
+#        fi
 
       ####################
       # Files permission #
@@ -292,5 +293,4 @@
 
 db_stop
 
-# For the rest
 #DEBHELPER#

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm?rev=3521&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm Wed Jan 17 00:07:47 2007
@@ -28,8 +28,8 @@
     # TODO: we should also remove all the file created by mldonkey, since it can
     # contain huge files which takes hours to download, I am still hesitating to do
     # so 
-    echo "Not removing MLDonkey directory (/var/lib/mldonkey," >&2
-    echo "/var/run/mldonkey), user and group. Remove it manually if needed." >&2
+    echo "Not removing MLDonkey directory (/var/lib/mldonkey, /var/run/mldonkey), user and group." >&2
+    echo "Remove it manually if needed." >&2
     ;;
   *) 
     echo "$0: didn't understand being called with \`$1'" 1>&2
@@ -37,5 +37,4 @@
     ;;
 esac
 
-#For the rest
 #DEBHELPER#