Fix upstream bug #1730 per RHBZ#845295

e9
Clint Savage 12 years ago
parent 3e6de58712
commit 86dd5d1b22

@ -0,0 +1,26 @@
From 4d65fbe3ef36e74c41d96f3c33aa3cf35ab4b09b Mon Sep 17 00:00:00 2001
From: Joseph Hall <perlhoser@gmail.com>
Date: Tue, 31 Jul 2012 05:34:27 -0600
Subject: [PATCH 12/13] Only expect args if they are actually passed in
---
salt/modules/disk.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/salt/modules/disk.py b/salt/modules/disk.py
index 0fca708..0964962 100644
--- a/salt/modules/disk.py
+++ b/salt/modules/disk.py
@@ -33,7 +33,8 @@ def usage(args=None):
cmd = 'df -kP'
else:
cmd = 'df'
- cmd = cmd + ' -' + args
+ if args:
+ cmd = cmd + ' -' + args
ret = {}
out = __salt__['cmd.run'](cmd).split('\n')
for line in out:
--
1.7.11.2

@ -10,7 +10,7 @@
Name: salt Name: salt
Version: 0.10.2 Version: 0.10.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: A parallel remote execution system Summary: A parallel remote execution system
Group: System Environment/Daemons Group: System Environment/Daemons
@ -24,6 +24,7 @@ Source4: %{name}-master.service
Source5: %{name}-syndic.service Source5: %{name}-syndic.service
Source6: %{name}-minion.service Source6: %{name}-minion.service
Source7: README.fedora Source7: README.fedora
Patch0: 0001-Only-expect-args-if-they-are-actually-passed-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
@ -106,6 +107,7 @@ Salt minion is queried and controlled from the master.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
@ -259,7 +261,10 @@ fi
%endif %endif
%changelog %changelog
* Sat Jul 31 2012 Clint Savage <herlo1@gmail.com> - 0.10.1-1 * Thu Aug 2 2012 Clint Savage <herlo1@gmail.com> - 0.10.2-2
- Fix upstream bug #1730 per RHBZ#845295
* Sat Jul 31 2012 Clint Savage <herlo1@gmail.com> - 0.10.2-1
- Moved to upstream release 0.10.2 - Moved to upstream release 0.10.2
- Removed PyXML as a dependency - Removed PyXML as a dependency

Loading…
Cancel
Save