From 86dd5d1b224854bbd50e2de819f7d8bd695f51e1 Mon Sep 17 00:00:00 2001
From: Clint Savage <herlo1@gmail.com>
Date: Thu, 2 Aug 2012 11:22:49 -0600
Subject: [PATCH] Fix upstream bug #1730 per RHBZ#845295

---
 ...-args-if-they-are-actually-passed-in.patch | 26 +++++++++++++++++++
 salt.spec                                     | 11 +++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 0001-Only-expect-args-if-they-are-actually-passed-in.patch

diff --git a/0001-Only-expect-args-if-they-are-actually-passed-in.patch b/0001-Only-expect-args-if-they-are-actually-passed-in.patch
new file mode 100644
index 0000000..994b210
--- /dev/null
+++ b/0001-Only-expect-args-if-they-are-actually-passed-in.patch
@@ -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
+
diff --git a/salt.spec b/salt.spec
index 6c87baf..ee5a96f 100644
--- a/salt.spec
+++ b/salt.spec
@@ -10,7 +10,7 @@
 
 Name: salt
 Version: 0.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -24,6 +24,7 @@ Source4: %{name}-master.service
 Source5: %{name}-syndic.service
 Source6: %{name}-minion.service
 Source7: README.fedora
+Patch0: 0001-Only-expect-args-if-they-are-actually-passed-in.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -106,6 +107,7 @@ Salt minion is queried and controlled from the master.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -259,9 +261,12 @@ fi
 %endif
 
 %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
-- Removed PyXML as a dependency 
+- Removed PyXML as a dependency
 
 * Sat Jun 16 2012 Clint Savage <herlo1@gmail.com> - 0.10.1-1
 - Moved to upstream release 0.10.1