Attachment 123060 Details for Bug 166322 – file.diff

[patch] file.diff

file.diff (text/plain), 1.95 KB, created by Christer Edwards on 2012-03-22 18:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2012-03-22 18:30:01 UTC

Size: 1.95 KB

patch

obsolete

>diff -ruN salt-0.9.8/files/patch-kvm_hyper.py salt-0.9.8_1/files/patch-kvm_hyper.py
>--- salt-0.9.8/files/patch-kvm_hyper.py 1969-12-31 17:00:00.000000000 -0700
>+++ salt-0.9.8_1/files/patch-kvm_hyper.py       2012-03-22 11:41:04.998199701 -0600
>@@ -0,0 +1,11 @@
>+--- salt-0.9.8/kvm_hyper.py     2012-03-22 10:57:13.019199302 -0600
>++++ salt/modules/kvm_hyper.py        2012-03-22 10:57:45.441204588 -0600
>+@@ -46,6 +46,8 @@
>+         return False
>+     if __grains__['virtual'] != 'physical':
>+         return False
>++    if __grains__['kernel'] != 'Linux':
>++        return False
>+     if 'kvm_' not in open('/proc/modules').read():
>+         return False
>+     if not has_libvirt:
>diff -ruN salt-0.9.8/files/patch-setup.py salt-0.9.8_1/files/patch-setup.py
>--- salt-0.9.8/files/patch-setup.py     2012-01-25 00:16:18.000000000 -0700
>+++ salt-0.9.8_1/files/patch-setup.py   2012-03-22 12:09:05.477195875 -0600
>@@ -1,6 +1,6 @@
>---- salt-0.9.6/setup.py 2012-01-21 02:18:08.000000000 +0000
>-+++ setup.py    2012-01-22 19:21:35.158004570 +0000
>-@@ -44,7 +44,7 @@
>+--- salt-0.9.8/setup.py        2012-03-21 11:46:26.000000000 -0600
>++++ setup.py   2012-03-22 11:57:51.926196304 -0600
>+@@ -47,7 +47,7 @@
>  if 'SYSCONFDIR' in os.environ:
>      etc_path = os.environ['SYSCONFDIR']
>  else:
>@@ -9,7 +9,7 @@
>
>  libraries = ['ws2_32'] if sys.platform == 'win32' else []
>
>-@@ -91,10 +91,10 @@
>+@@ -98,10 +98,10 @@
>                 'scripts/salt-run',
>                 'scripts/salt'],
>        data_files=[(os.path.join(etc_path, 'salt'),
>@@ -23,7 +23,7 @@
>                      ['doc/man/salt-master.1',
>                       'doc/man/salt-key.1',
>                       'doc/man/salt.1',
>-@@ -104,7 +104,7 @@
>+@@ -111,9 +111,8 @@
>                       'doc/man/salt-run.1',
>                       'doc/man/salt-minion.1',
>                      ]),
>@@ -32,3 +32,5 @@
>                      ['doc/man/salt.7',
>                      ]),
>                   ],
>+-      install_requires=requirements,
>+      )

Actions: View | Diff

Attachments on bug 166322: 123060 | 123061