cleanup error message from usermod command

diff --git a/Makefile b/Makefile
index 01f1e2af28d26629fcfffbf28d517fee62bf2022..6474818a3b31531580c8972d9fb4968c0dbb40d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 VERSION=1.0
-PKGREL=16
+PKGREL=17
 
 PACKAGE=libpve-common-perl
 

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 319961651669136c427dde07c0a77de9e908203f..66bc644d3bde91262d44e849e714d47100985653 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -417,6 +417,7 @@ sub run_command {
        }
 
        if ($errmsg) {
+           $err =~ s/^usermod:\s*// if $cmdstr =~ m|^(\S+/)?usermod\s|;
            die "$errmsg: $err";
        } else {
            die "command '$cmdstr' failed: $err";

diff --git a/debian/changelog b/debian/changelog
index 92a93b4ab57bd3e80fe17aa821f89cabfc7750fd..3ccea5631905f41016e2671a521fdd55d5eb3d06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpve-common-perl (1.0-17) unstable; urgency=low
+
+  * better error message for usermod command
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 01 Mar 2012 12:42:30 +0100
+
 libpve-common-perl (1.0-16) unstable; urgency=low
 
   * try to keep comments in /etc/network/interfaces