Merge pull request #59 from jsuchome/fix_tail_usage

- fix the usage of tail command, so the quota state is read
yast · Sep 23, 2014 · 10d10ba · 10d10ba
2 parents fcb9da3 + c34f8cf
commit 10d10ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 23 10:14:55 CEST 2014 - jsuchome@suse.cz
+
+- fix the usage of tail command, so the quota state is read
+  correctly (bnc#887753)
+- 3.1.33
+
 -------------------------------------------------------------------
 Wed Sep  3 08:26:34 CEST 2014 - schubi@suse.de
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.32
+Version:        3.1.33
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/UsersPluginQuota.pm b/src/modules/UsersPluginQuota.pm
@@ -135,7 +135,7 @@ sub read_quota_info {
 	my %fsystems	= ();
 	my @quotalist	= ();
 
-	my $cmd	= "LANG=C quota $opt -pv 2>/dev/null | tail +3";
+	my $cmd	= "LANG=C quota $opt -pv 2>/dev/null | tail -n +3";
 	my $out	= SCR->Execute (".target.bash_output", $cmd);
 	if ($out->{"stdout"}) {
 	    # each line in stdout reports quota for one filesystem
@@ -186,7 +186,7 @@ sub is_quota_available {
 sub has_quota {
 
     my $opt = shift;
-    my $out = SCR->Execute (".target.bash_output", "LANG=C quota $opt -v 2>/dev/null | tail +3");
+    my $out = SCR->Execute (".target.bash_output", "LANG=C quota $opt -v 2>/dev/null | tail -n +3");
     return ($out->{"stdout"});
 }