rpms/python-virtinst/devel virtinst-0.400.0-disk-pool-fixes.patch, NONE, 1.1 virtinst-0.400.0-update-translations.patch, NONE, 1.1 virtinst-0.400.0-win64-entry.patch, NONE, 1.1 python-virtinst.spec, 1.47, 1.48 virtinst-0.400.0-polish-translation.patch, 1.1, NONE

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3618

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.0-disk-pool-fixes.patch 
	virtinst-0.400.0-update-translations.patch 
	virtinst-0.400.0-win64-entry.patch 
Removed Files:
	virtinst-0.400.0-polish-translation.patch 
Log Message:
Updated translations (bz 467810)
Specific os entry for windows XP 64 (bz 467851)
Disk pool 'dos' format fix


virtinst-0.400.0-disk-pool-fixes.patch:

--- NEW FILE virtinst-0.400.0-disk-pool-fixes.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1224696223 14400
# Node ID 729ce5453a5877db0cb79b6bcfd18cc649028498
# Parent  2c657c53ef1add11627f259477463e422ae0774f
Disk type is 'dos' not 'msdos'

diff -r 2c657c53ef1a -r 729ce5453a58 virtinst/Storage.py
--- a/virtinst/Storage.py	Tue Oct 21 10:18:07 2008 -0400
+++ b/virtinst/Storage.py	Wed Oct 22 13:23:43 2008 -0400
@@ -579,7 +579,7 @@
     source_path = property(StoragePool.get_source_path,
                            StoragePool.set_source_path)
 
-    formats = [ "auto", "bsd", "msdos", "dvh", "gpt", "mac", "pc98", "sun" ]
+    formats = [ "auto", "bsd", "dos", "dvh", "gpt", "mac", "pc98", "sun" ]
 
     def get_volume_class():
         return DiskVolume
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1224700636 14400
# Node ID 70b32f9b4d74cdec2aad4eeb43c196dfb6c6bdde
# Parent  729ce5453a5877db0cb79b6bcfd18cc649028498
Actually return pool object after DiskPool install.

diff -r 729ce5453a58 -r 70b32f9b4d74 virtinst/Storage.py
--- a/virtinst/Storage.py	Wed Oct 22 13:23:43 2008 -0400
+++ b/virtinst/Storage.py	Wed Oct 22 14:37:16 2008 -0400
@@ -624,7 +624,8 @@
         if self.format == "auto" and build:
             raise ValueError(_("Must explicitly specify disk format if "
                                "formatting disk device."))
-        StoragePool.install(self, meter=meter, create=create, build=build)
+        return StoragePool.install(self, meter=meter, create=create,
+                                   build=build)
 
 class iSCSIPool(StoragePool):
     """

virtinst-0.400.0-update-translations.patch:

--- NEW FILE virtinst-0.400.0-update-translations.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1221590914 14400
# Node ID dc76d336082ecb37c94d2f1fc269d8d8e6390faf
# Parent  6a4c3f52df1eff47011657f87818bb204227db36
Updated polish translation.

diff -r 6a4c3f52df1e -r dc76d336082e po/pl.po
--- a/po/pl.po	Tue Sep 16 14:44:49 2008 -0400
+++ b/po/pl.po	Tue Sep 16 14:48:34 2008 -0400
@@ -6,7 +6,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-10 14:00-0400\n"
-"PO-Revision-Date: 2008-03-04 21:30+0200\n"
+"PO-Revision-Date: 2008-09-15 22:59+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,12 +32,11 @@
 #: virt-clone:94
 #, python-format
 msgid "This will overwrite the existing path '%s'!\n"
-msgstr ""
+msgstr "To zastąpi istniejącą ścieżkę \"%s\"!\n"
 
 #: virt-clone:96
-#, fuzzy
 msgid "Do you really want to use this disk (yes or no)?"
-msgstr "Na pewno chcesz użyć dysku (\"yes\" lub \"no\")?"
+msgstr "Na pewno chcesz użyć tego dysku (\"yes\" lub \"no\")?"
 
 #: virt-clone:102 virt-install:202
 #, python-format
@@ -102,6 +101,8 @@
 "Do not prompt for input. Answers yes where applicable, terminates for all "
 "other prompts"
 msgstr ""
+"Nie wyświetlaj komunikatów z prośbami. Odpowiada \"tak\" tam, gdzie to "
+"możliwe, kończy pracę przy wszystkich innych prośbach"
 
 #: virt-clone:194
 msgid "Must be root to clone Xen guests"
@@ -117,11 +118,13 @@
 "Warning: more networks were provided [%i] then nics required [%i]. All "
 "extras are ignored"
 msgstr ""
+"Ostrzeżenie: podano więcej sieci [%i] niż wymaganych pseudonimów [%i]. "
+"Wszystkie dodatkowe zostanÄ… zignorowane"
 
 #: virt-image:71
-#, fuzzy, python-format
+#, python-format
 msgid "The image requires %i network interface"
-msgstr "Obraz wymaga jednego interfejsu sieciowego"
+msgstr "Obraz wymaga %i interfejsu sieciowego"
 
 #: virt-image:90 virt-install:323
 msgid "Name of the guest instance"
@@ -179,7 +182,7 @@
 
 #: virt-image:116 virt-install:431
 msgid "Port to use for VNC"
-msgstr "Port do używania dla VNC"
+msgstr "Użyty port dla VNC"
 
 #: virt-image:118 virt-install:433
 msgid "Use SDL for graphics support"
@@ -219,20 +222,19 @@
 
 #: virt-image:146
 msgid "Overwrite, or destroy, an existing image with the same name"
-msgstr ""
+msgstr "Zastąp lub usuń istniejący obraz o tej samej nazwie"
 
 #: virt-image:151 virt-pack:113
 msgid "You need to provide an image XML descriptor"
 msgstr "Musisz podać deskryptor XML obrazu"
 
 #: virt-image:168
-#, fuzzy
 msgid "Cannot parse"
-msgstr "Nie można odczytać %s"
+msgstr "Nie można przeanalizować"
 
 #: virt-image:172
 msgid "Cannot parse capabilities"
-msgstr ""
+msgstr "Nie można przeanalizować możliwości"
 
 #: virt-image:177
 #, python-format
@@ -268,62 +270,62 @@
 "przypadku uruchom ponownie instalacjÄ™."
 
 #: virt-install:73
-#, fuzzy, python-format
+#, python-format
 msgid "Couldn't create default storage pool '%s': %s"
-msgstr "Nie można pobrać pliku %s: %s"
+msgstr "Nie można utworzyć domyślnej puli pamięci masowej \"%s\": %s"
 
 #: virt-install:96
 msgid "--disk path must start with path=, pool=, or vol=."
-msgstr ""
+msgstr "Ścieżka --disk musi zaczynać się od path=, pool= lub vol=."
 
 #: virt-install:122 virt-install:134
 #, python-format
 msgid "Unknown '%s' value '%s'"
-msgstr ""
+msgstr "Nieznana \"%s\" wartość \"%s\""
 
 #: virt-install:127
 #, python-format
 msgid "Improper value for 'size': %s"
-msgstr ""
+msgstr "Niewłaściwa wartość dla \"size\": %s"
 
 #: virt-install:136
 #, python-format
 msgid "Unknown --disk option '%s'."
-msgstr ""
+msgstr "Nieznana opcja --disk \"%s\"."
 
 #: virt-install:145
-#, fuzzy
 msgid "Size must be specified with all 'pool='"
-msgstr "Położenie do zainstalowania musi zostać podane"
+msgstr "Rozmiar musi zostać podany z całą \"pool=\""
 
 #: virt-install:158
 msgid "Storage volume must be specified as pool=poolname/volname"
 msgstr ""
+"Wolumin pamięci masowej musi zostać podany jako pool=nazwapuli/nazwawoluminu"
 
 #: virt-install:198
 #, python-format
 msgid "Error with storage parameters: %s"
-msgstr ""
+msgstr "Błąd argumentów pamięci masowej: %s"
 
 #: virt-install:210
-#, fuzzy
 msgid " Do you really want to use the disk (yes or no)?"
-msgstr "Na pewno chcesz użyć dysku (\"yes\" lub \"no\")?"
+msgstr "Na pewno chcesz użyć tego dysku (\"yes\" lub \"no\")?"
 
 #: virt-install:218
-#, fuzzy
 msgid "Cannot use --file, --size, or --disk with --nodisks"
-msgstr "Nie można używać --file z --nodisks"
+msgstr "Nie można używać --file, --size lub --disk z --nodisks"
 
 #: virt-install:221
 msgid ""
 "Cannot mix --file, --nonsparse, or --file-size with --disk options. Please "
 "see the manual for --disk syntax."
 msgstr ""
+"Nie można mieszać --file, --nonsparse lub --file-size z opcją --disk. Zobacz "
+"podręcznik, aby uzyskać informacje o składni --disk."
 
 #: virt-install:224
 msgid "A disk must be specified (use --nodisks to override)"
-msgstr ""
+msgstr "Dysk musi zostać podany (użyj --nodisks, aby zastąpić)"
 
 #: virt-install:232
 msgid "Need to pass size for each disk"
@@ -334,33 +336,30 @@
 msgstr "Tylko jedno z --pxe, --location i --cdrom może zostać użyte"
 
 #: virt-install:263
-#, fuzzy
 msgid "Network PXE boot is not supported for paravirtualized guests"
 msgstr ""
 "Uruchamianie sieciowe PXE nie jest obsługiwane dla gości parawirtualizowanych"
 
 #: virt-install:266
 msgid "Paravirtualized guests cannot install off cdrom media."
-msgstr ""
+msgstr "Goście parawirtualizowani nie mogą być instalowani z nośnika CD-ROM."
 
 #: virt-install:268
-#, fuzzy
 msgid "location must be specified for paravirtualized guests."
-msgstr "Położenie do zainstalowania musi zostać podane"
+msgstr "położenie dla gości parawirtualizowanych musi zostać podane."
 
 #: virt-install:271
 msgid "--location can not be specified for remote connections."
-msgstr ""
+msgstr "--location nie może zostać podane dla połączeń zdalnych."
 
 #: virt-install:280
-#, fuzzy
 msgid "One of --pxe, --location, or cdrom media must be specified."
-msgstr "Tylko jedno z --pxe, --location i --cdrom może zostać użyte"
+msgstr "Tylko jedno z --pxe, --location lub nośnik CD-ROM może zostać podane."
[...3934 lines suppressed...]
+#: virtinst/Storage.py:801
+msgid "Allocation must be a non-negative number"
+msgstr "Allocation 必须是一个非负数"
+
+#: virtinst/Storage.py:821
+msgid "'pool' must be a virStoragePool instance."
+msgstr "'pool' 必须是一个 virStoragePool 事件。"
+
+#: virtinst/Storage.py:823
+#, python-format
+msgid "pool '%s' must be active."
+msgstr "æ±  '%s' 必须活跃。"
+
+#: virtinst/Storage.py:832
+#, python-format
+msgid "'%s' is not a valid format."
+msgstr "'%s' ä¸æ˜¯æœ‰æ•ˆæ ¼å¼ã€‚"
+
+#: virtinst/Storage.py:842
+#, python-format
+msgid "Name '%s' already in use by another volume."
+msgstr "名称 '%s' 已经被另一个卷使用。"
+
+#: virtinst/Storage.py:912
+#, python-format
+msgid ""
+"There is not enough free space on the storage pool to create the volume. (%d "
+"M requested allocation > %d M available)"
+msgstr "å­˜å‚¨æ± ä¸­æ²¡æœ‰è¶³å¤Ÿç©ºé—´æ¥åˆ›å»ºå·ã€‚ï¼ˆ%d M 需要的空间 > %d M 可用空间）"
+
+#: virtinst/Storage.py:918
+#, python-format
+msgid ""
+"The requested volume capacity will exceed the available pool space when the "
+"volume is fully allocated. (%d M requested capacity > %d M available)"
+msgstr "å½“å·å·²ç»è¢«å…¨éƒ¨åˆ†é…åŽï¼Œéœ€è¦çš„å·å®¹é‡å°†è¶…è¿‡å¯ç”¨æ± ç©ºé—´ã€‚ï¼ˆ%d M 需要的容量 > %d M 可用容量）"
+
+#: virtinst/util.py:45
+#, python-format
+msgid "Invalid line length while parsing %s."
+msgstr "解析 %s æ—¶å‡ºçŽ°æ— æ•ˆè¡Œé•¿åº¦ã€‚"
+
+#: virtinst/util.py:46
+#, python-format
+msgid "Defaulting bridge to xenbr%d"
+msgstr "到 xenbr%d 的默认桥接"
+
+#: virtinst/util.py:402 virtinst/VirtualDevice.py:59
+msgid "'conn' must be a virConnect instance."
+msgstr "'conn' 必须是一个 virConnect 事件。"
+
+#: virtinst/VirtualDevice.py:44
+msgid "'conn' must be a virConnect instance"
+msgstr "'conn' 必须是一个 virConnect 事件"
+
+#: virtinst/VirtualDevice.py:68
+#, python-format
+msgid "'%s' must be True or False"
+msgstr "'%s' 必须是 True 或者 False"
+
+#: virtinst/VirtualDevice.py:72
+#, python-format
+msgid "'%s' must be a string, not '%s'."
+msgstr "'%s' 必须是一个字符串，而不是 '%s' 。"
+
+#: virtinst/VirtualDisk.py:160
+msgid "'size' must be a number greater than 0."
+msgstr "'size' 必须是一个大于 0 的数字。"
+
+#: virtinst/VirtualDisk.py:170
+#, python-format
+msgid "Unknown storage type '%s'"
+msgstr "位置存储类型 '%s'"
+
+#: virtinst/VirtualDisk.py:179
+#, python-format
+msgid "Unknown device type '%s'"
+msgstr "位置设备类型 '%s'"
+
+#: virtinst/VirtualDisk.py:209
+msgid "vol_object must be a virStorageVol instance"
+msgstr "vol_object 必须是一个 virStorageVol 事件"
+
+#: virtinst/VirtualDisk.py:217
+msgid "vol_install must be a StorageVolume  instance."
+msgstr "vol_install 必须是一个 StorageVolume 事件。"
+
+#: virtinst/VirtualDisk.py:258
+msgid "Unknown storage volume type."
+msgstr "未知存储卷类型。"
+
+#: virtinst/VirtualDisk.py:273
+#, python-format
+msgid "Passed type '%s' does not match detected storage type '%s'"
+msgstr "以前的类型 '%s' 与存储类型 '%s' 不匹配"
+
+#: virtinst/VirtualDisk.py:283
+msgid "volName must be a tuple of the form ('poolname', 'volname')"
+msgstr "volName 必须是 tuple æ ¼å¼ï¼ˆ'poolname'，'volname'）"
+
+#: virtinst/VirtualDisk.py:286
+msgid "'volName' requires a passed connection."
+msgstr "'volName' 需要以前的连接。"
+
+#: virtinst/VirtualDisk.py:288
+msgid "Connection does not support storage lookup."
+msgstr "连接不支持存储查找。"
+
+#: virtinst/VirtualDisk.py:294
+#, python-format
+msgid "Couldn't lookup volume object: %s"
+msgstr "æ— æ³•æŸ¥æ‰¾å·å¯¹è±¡ï¼š%s"
+
+#: virtinst/VirtualDisk.py:315
+msgid "Connection doesn't support remote storage."
+msgstr "连接不支持远程存储。"
+
+#: virtinst/VirtualDisk.py:334
+#, python-format
+msgid "Size must be specified for non existent path '%s'"
+msgstr "必须为非现有路径 '%s' 指定大小"
+
+#: virtinst/VirtualDisk.py:354
+#, python-format
+msgid "'%s' is not managed on remote host: %s"
+msgstr "远程主机中不管理 '%s'：%s"
+
+#: virtinst/VirtualDisk.py:364
+msgid "Must specify libvirt managed storage if on a remote connection"
+msgstr "如果是在远程连接中则必须指定 libvirt 管理的存储"
+
+#: virtinst/VirtualDisk.py:371
+#, python-format
+msgid "Device type '%s' requires a path"
+msgstr "设备类型 '%s' 需要一个路径"
+
+#: virtinst/VirtualDisk.py:402
+msgid "The path must be a file or a device, not a directory"
+msgstr "该路径必须是一个文件或者一个设备，而不是一个目录。"
+
+#: virtinst/VirtualDisk.py:410
+#, python-format
+msgid "Cannot create storage for %s device."
+msgstr "æ— æ³•ä¸º %s 设备创建存储。"
+
+#: virtinst/VirtualDisk.py:416
+msgid "Local block device path must exist."
+msgstr "必须存在本地块设备路径。"
+
+#: virtinst/VirtualDisk.py:421
+#, python-format
+msgid "No write access to directory '%s'"
+msgstr "æ— æ³•å¯¹ç›®å½• '%s' 进行写入访问"
+
+#: virtinst/VirtualDisk.py:424
+#, python-format
+msgid "size is required for non-existent disk '%s'"
+msgstr "non-existent 磁盘 '%s' 需要大小"
+
+#: virtinst/VirtualDisk.py:459
+msgid "Creating storage file..."
+msgstr "创建存储文件......"
+
+#: virtinst/VirtualDisk.py:476
+#, python-format
+msgid "Error creating diskimage %s: %s"
+msgstr "åˆ›å»ºç£ç›˜æ˜ åƒ %s 出错：%s"
+
+#: virtinst/VirtualDisk.py:498
+msgid "'disknode' or self.target must be set!"
+msgstr "必须设置 'disknode' 或者 self.target！"
+
+#: virtinst/VirtualDisk.py:558
+msgid ""
+"The filesystem will not have enough free space to fully allocate the sparse "
+"file when the guest is running."
+msgstr "客户端运行时，文件系统将没有足够空间来部署全部稀疏文件。"
+
+#: virtinst/VirtualDisk.py:563
+msgid "There is not enough free space to create the disk."
+msgstr "没有足够的可用空间创建这个磁盘。"
+
+#: virtinst/VirtualDisk.py:567
+#, python-format
+msgid " %d M requested > %d M available"
+msgstr " 要求的 %d M > 可用的 %d M"
+
+#: virtinst/VirtualDisk.py:670
+msgid "Cannot determine device bus/type."
+msgstr "æ— æ³•ç¡®å®šè®¾å¤‡æ€»çº¿/类型。"
+
+#: virtinst/VirtualDisk.py:677
+msgid "IDE CDROM must use 'hdc', but target in use."
+msgstr "IDE CDROM 必须是 'hdc'ï¼Œä½†ç›®æ ‡å·²ç»è¢«ä½¿ç”¨ã€‚ "
+
+#: virtinst/VirtualDisk.py:693
+#, python-format
+msgid "No more space for disks of type '%s'"
+msgstr "没有 '%s' 类型磁盘可用的空间"
+

virtinst-0.400.0-win64-entry.patch:

--- NEW FILE virtinst-0.400.0-win64-entry.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1224598687 14400
# Node ID 2c657c53ef1add11627f259477463e422ae0774f
# Parent  976334e291925088aab37be0b8f9870b163de146
Add seperate dict entry for winxp 64 since it has separate requirements (Tom Hug
hes)

diff -r 976334e29192 -r 2c657c53ef1a AUTHORS
--- a/AUTHORS	Mon Oct 20 11:11:20 2008 -0400
+++ b/AUTHORS	Tue Oct 21 10:18:07 2008 -0400
@@ -31,6 +31,7 @@
    Bryan Kearney <bkearney-at-redhat-dot-com>
    Guido Guenther <agx-at-sigxcpu-dot-org>
    Francois Kooman <fkooman-at-tuxed-dot-net>
+   Tom Hughes <thh-at-cyberspace-dot-com>
 
    ...send patches and get your name here...
 
diff -r 976334e29192 -r 2c657c53ef1a virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Mon Oct 20 11:11:20 2008 -0400
+++ b/virtinst/FullVirtGuest.py	Tue Oct 21 10:18:07 2008 -0400
@@ -111,8 +111,9 @@
                         "bus"  : [ (["all"], "usb"), ] },
         },
         "variants": { \
-            "winxp":{ "label": "Microsoft Windows XP",
+            "winxp":{ "label": "Microsoft Windows XP (x86)",
                       "acpi": False, "apic": False },
+            "winxp64":{ "label": "Microsoft Windows XP (x86_64)" },
             "win2k": { "label": "Microsoft Windows 2000",
                        "acpi": False, "apic": False },
             "win2k3": { "label": "Microsoft Windows 2003" },


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- python-virtinst.spec	20 Oct 2008 14:11:41 -0000	1.47
+++ python-virtinst.spec	27 Oct 2008 19:36:00 -0000	1.48
@@ -11,16 +11,18 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{appname}-%{version}-polish-translation.patch
-Patch2: %{appname}-%{version}-qemu-conn-check.patch
-Patch3: %{appname}-%{version}-virt-convert-dict.patch
-Patch4: %{appname}-%{version}-virtio-f9.patch
-Patch5: %{appname}-%{version}-log-fail-traceback.patch
-Patch6: %{appname}-%{version}-bridge-network-collision.patch
-Patch7: %{appname}-%{version}-refresh-storage-pool.patch
-Patch8: %{appname}-%{version}-missing-variable.patch
+Patch1: %{appname}-%{version}-qemu-conn-check.patch
+Patch2: %{appname}-%{version}-virt-convert-dict.patch
+Patch3: %{appname}-%{version}-virtio-f9.patch
+Patch4: %{appname}-%{version}-log-fail-traceback.patch
+Patch5: %{appname}-%{version}-bridge-network-collision.patch
+Patch6: %{appname}-%{version}-refresh-storage-pool.patch
+Patch7: %{appname}-%{version}-missing-variable.patch
+Patch8: %{appname}-%{version}-disk-pool-fixes.patch
+Patch9: %{appname}-%{version}-win64-entry.patch
+Patch10: %{appname}-%{version}-update-translations.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +59,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 python setup.py build
@@ -91,6 +95,11 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 27 2008 Cole Robinson <crobinso at redhat.com> - 0.400.0-4.fc10
+- Updated translations (bz 467810)
+- Specific os entry for XP 64 (bz 467851)
+- Disk pool 'dos' format fix
+
 * Mon Oct 20 2008 Cole Robinson <crobinso at redhat.com> - 0.400.0-3.fc10
 - Fix missing variable error (bz 467228)
 


--- virtinst-0.400.0-polish-translation.patch DELETED ---