[Pkg-libvirt-commits] [SCM] Virt Installer packaging branch, master, updated. debian/0.400.0-3-4-gc6eb3fa

[Guido Guenther]

The following commit has been merged in the master branch:
commit 58763f39dee7253cc63062052d7cbd1ca4153c75
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Oct 22 10:08:23 2008 +0200

    fix indentaion for 0006-scratchdir-for-uid-0.patch

diff --git a/debian/patches/0006-scratchdir-for-uid-0.patch b/debian/patches/0006-scratchdir-for-uid-0.patch
index 24b6be1..5c68605 100644
--- a/debian/patches/0006-scratchdir-for-uid-0.patch
+++ b/debian/patches/0006-scratchdir-for-uid-0.patch
@@ -1,4 +1,4 @@
-From 22f73ccf5560666d947eaa885d9f8b3b28c157a3 Mon Sep 17 00:00:00 2001
+From 8dafa6252e8ec18714698f33b1d2d7e180b38bbb Mon Sep 17 00:00:00 2001
 From: Guido Guenther <agx at sigxcpu.org>
 Date: Mon, 22 Sep 2008 12:24:43 +0200
 Subject: [PATCH] scratchdir for uid != 0
@@ -8,7 +8,7 @@ Subject: [PATCH] scratchdir for uid != 0
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/Guest.py b/virtinst/Guest.py
-index 94d5730..d38a81e 100644
+index 94d5730..1919540 100644
 --- a/virtinst/Guest.py
 +++ b/virtinst/Guest.py
 @@ -323,7 +323,10 @@ class Installer(object):
@@ -16,13 +16,13 @@ index 94d5730..d38a81e 100644
              if os.path.exists("/var/lib/xen"):
                  return "/var/lib/xen"
 -        return "/var/lib/libvirt/boot"
-+	if os.getuid() == 0:
++        if os.getuid() == 0:
 +            return "/var/lib/libvirt/boot"
-+	else:
-+	    return os.path.expanduser("~/.libvirt/boot")
++        else:
++            return os.path.expanduser("~/.libvirt/boot")
      scratchdir = property(get_scratchdir)
  
      def get_cdrom(self):
 -- 
-1.5.6.5
+1.6.0.1
 

-- 
Virt Installer packaging