Attachment 601980 Details for Bug 845295 – apply upstream patch to fix disk.usage

[patch] apply upstream patch to fix disk.usage

0001-fix-disk.usage-problem.patch (text/plain), 2.13 KB, created by Jeffrey C. Ollie on 2012-08-02 15:05:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeffrey C. Ollie

Created: 2012-08-02 15:05:28 UTC

Size: 2.13 KB

patch

obsolete

>From a4bd01625658ebb0935147f590e571f260af8964 Mon Sep 17 00:00:00 2001
>From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
>Date: Thu, 2 Aug 2012 09:39:38 -0500
>Subject: [PATCH] fix disk.usage problem
>
>---
> ...xpect-args-if-they-are-actually-passed-in.patch |   26 ++++++++++++++++++++
> salt.spec                                          |    4 ++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
> 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..f19caf2
>--- /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] 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..a55f368 100644
>--- a/salt.spec
>+++ b/salt.spec
>@@ -10,7 +10,7 @@
> 
> Name: salt
> Version: 0.10.2
>-Release: 1%{?dist}
>+Release: 1%{?dist}.1
> 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
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 845295: 601980