[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. 06f8c717989bc8084454638873d9a981ffa644a1

[David Wendt]

The following commit has been merged in the master branch:
commit 4f4f10df88a8a75d1c42033e053425b5634013f8
Author: David Wendt <kmeisthax at Lappy-486.A>
Date:   Tue Jul 21 12:41:31 2009 -0400

    Patch by Cedric Jeanneret <cedric.jeanneret at camptocamp.com>:
    
    I'm using your vmbuilder version (git://git.debian.org/git/pkg-escience/vmbuilder.git) and found some problems. Here is one patch which prevent errors while creating filesystem, especially swap partitions

diff --git a/VMBuilder/disk.py b/VMBuilder/disk.py
index 95e1373..53878bf 100644
--- a/VMBuilder/disk.py
+++ b/VMBuilder/disk.py
@@ -218,13 +218,7 @@ class Disk(object):
             @rtype: string
             @return: the filesystem type of the partition suitable for passing to parted
             """
-            if None:
-                return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap' }[self.type]
-            else:
-                # latest parted versions (observed with parted (GNU parted) 1.8.8.1.159-1e0e in Debian sid) demand
-                # a different specification of the swap partition, see 
-                # http://www.mail-archive.com/bug-parted@gnu.org/msg02400.html
-                return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap(new)' }[self.type]
+            return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap' }[self.type]
 
         def create(self, disk):
             """Adds partition to the disk image (does not mkfs or anything like that)"""

-- 
Tool for creating VM images.