[arch-commits] Commit in libvirt/trunk (PKGBUILD libvirt.install python.patch)

[Sergej Pupykin]

    Date: Thursday, January 31, 2013 @ 16:59:29
  Author: spupykin
Revision: 83404

upgpkg: libvirt 1.0.2-2

upd

Added:
  libvirt/trunk/python.patch
Modified:
  libvirt/trunk/PKGBUILD
  libvirt/trunk/libvirt.install

-----------------+
 PKGBUILD        |    2 +-
 libvirt.install |   27 ++++-----------------------
 python.patch    |   22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-31 12:12:11 UTC (rev 83403)
+++ PKGBUILD	2013-01-31 15:59:29 UTC (rev 83404)
@@ -4,7 +4,7 @@
 
 pkgname=libvirt
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"

Modified: libvirt.install
===================================================================
--- libvirt.install	2013-01-31 12:12:11 UTC (rev 83403)
+++ libvirt.install	2013-01-31 15:59:29 UTC (rev 83404)
@@ -1,38 +1,19 @@
 _libvirt_setup() {
   systemd-tmpfiles --create libvirt.conf
-  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
-  echo ">>> To use libvirt as a non-root user:"
-  echo ">>>  Use polkit to grant access."
-  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
-  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
-  echo ""
 }
 
 post_install() {
   _libvirt_setup || return 1
-  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
-  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
-  echo ""
-  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
-  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
-  echo ">>>  booting."
-  echo ""
+  echo ">>>  See https://wiki.archlinux.org/index.php/Libvirt for more info"
 }
 
 post_upgrade() {
   _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by:"
-  echo ">>>  'systemctl restart libvirtd' as root (systemd) or"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root (initscripts) or"
-  echo ">>>  rebooting."
-  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
-  echo ""
+  echo ">>> You may need to run 'rm -rf ~/.libvirt'"
+  echo ">>> libvirt runs qemu from nobody:nobody by default"
+  echo ">>> change it in /etc/libvirt/qemu.conf"
 }
 
 post_remove() {
    rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
-   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
-   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
-   echo ""
-   depmod -a
 }

Added: python.patch
===================================================================
--- python.patch	                        (rev 0)
+++ python.patch	2013-01-31 15:59:29 UTC (rev 83404)
@@ -0,0 +1,22 @@
+diff --git a/python/generator.py b/python/generator.py
+index 5d27f66..71ca883 100755
+--- a/python/generator.py
++++ b/python/generator.py
+@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler):
+                     self.function_return_field = attrs['field']
+         elif tag == 'enum':
+             if (attrs['file'] == "libvirt" or
+-                attrs['file'] == "virterror"):
++                attrs['file'] == "virerror"):
+                 enum(attrs['type'],attrs['name'],attrs['value'])
+             elif attrs['file'] == "libvirt-lxc":
+                 lxc_enum(attrs['type'],attrs['name'],attrs['value'])
+@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler):
+             if self.function != None:
+                 if (self.function_module == "libvirt" or
+                     self.function_module == "virevent" or
+-                    self.function_module == "virterror"):
++                    self.function_module == "virerror"):
+                     function(self.function, self.function_descr,
+                              self.function_return, self.function_args,
+                              self.function_file, self.function_module,