rpms/virt-manager/F-9 virt-manager-0.5.4-image-dir.patch, NONE, 1.1 virt-manager.spec, 1.34, 1.35

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/virt-manager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7305

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.5.4-image-dir.patch 
Log Message:
Set default disk image dir to /var/lib/libvirt/images

virt-manager-0.5.4-image-dir.patch:

--- NEW FILE virt-manager-0.5.4-image-dir.patch ---
diff -rup virt-manager-0.5.4.orig/src/virtManager/config.py virt-manager-0.5.4.new/src/virtManager/config.py
--- virt-manager-0.5.4.orig/src/virtManager/config.py	2008-03-10 20:17:51.000000000 -0400
+++ virt-manager-0.5.4.new/src/virtManager/config.py	2008-05-09 13:42:21.000000000 -0400
@@ -37,6 +37,9 @@ CONSOLE_KEYGRAB_MOUSEOVER = 2
 DEFAULT_XEN_IMAGE_DIR = "/var/lib/xen/images"
 DEFAULT_XEN_SAVE_DIR = "/var/lib/xen/dump"
 
+DEFAULT_VIRT_IMAGE_DIR = "/var/lib/libvirt/images"
+DEFAULT_VIRT_SAVE_DIR = "/var/lib/libvirt"
+
 class vmmConfig:
     def __init__(self, appname, appversion, gconf_dir, glade_dir, icon_dir, data_dir):
         self.appname = appname
@@ -332,12 +335,16 @@ class vmmConfig:
     def get_default_image_dir(self, connection):
         if connection.get_type() == "Xen":
             return DEFAULT_XEN_IMAGE_DIR
+        elif os.access(DEFAULT_VIRT_IMAGE_DIR, os.W_OK):
+            return DEFAULT_VIRT_IMAGE_DIR
         else:
             return os.getcwd()
 
     def get_default_save_dir(self, connection):
         if connection.get_type() == "Xen":
             return DEFAULT_XEN_SAVE_DIR
+        elif os.access(DEFAULT_VIRT_SAVE_DIR, os.W_OK):
+            return DEFAULT_VIRT_SAVE_DIR
         else:
             return os.getcwd()
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-9/virt-manager.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- virt-manager.spec	3 Apr 2008 21:41:10 -0000	1.34
+++ virt-manager.spec	9 May 2008 17:56:14 -0000	1.35
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.5.4
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -19,6 +19,7 @@
 Source2: %{name}.console
 Patch1: %{name}-%{version}-polkit-root.patch
 Patch2: %{name}-%{version}-i18n.patch
+Patch3: %{name}-%{version}-image-dir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -38,7 +39,7 @@
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen guests
-Requires: python-virtinst >= 0.300.2
+Requires: python-virtinst >= 0.300.3-6.fc9
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -72,6 +73,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -162,6 +164,9 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Fri May  9 2008 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-4.fc9
+- Default disk images to /var/lib/libvirt/images
+
 * Thu Apr  3 2008 Daniel P. Berrange <berrange at redhat.com> - 0.5.4-3.fc9
 - Updated sr, de, fi, it, pl translations