rpms/python-virtinst/F-9 virtinst-0.400.0-bridge-network-collision.patch, NONE, 1.1 virtinst-0.400.0-disk-pool-fixes.patch, NONE, 1.1 virtinst-0.400.0-fix-translated-help.patch, NONE, 1.1 virtinst-0.400.0-log-fail-traceback.patch, NONE, 1.1 virtinst-0.400.0-missing-variable.patch, NONE, 1.1 virtinst-0.400.0-qemu-conn-check.patch, NONE, 1.1 virtinst-0.400.0-refresh-storage-pool.patch, NONE, 1.1 virtinst-0.400.0-update-translations.patch, NONE, 1.1 virtinst-0.400.0-virt-convert-dict.patch, NONE, 1.1 virtinst-0.400.0-virtio-f9.patch, NONE, 1.1 virtinst-0.400.0-win64-entry.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 python-virtinst.spec, 1.43, 1.44 sources, 1.14, 1.15 virtinst-0.300.3-boot-dir.patch, 1.1, NONE virtinst-0.300.3-fix-default-arch.patch, 1.1, NONE virtinst-0.300.3-fv-extraargs.patch, 1.1, NONE virtinst-0.300.3-hvm-kernel.patch, 1.1, NONE virtinst-0.300.3-i18n.patch, 1.1, NONE virtinst-0.300.3-keep-qemu-cdrom.patch, 1.1, NONE virtinst-0.300.3-update-polish-trans.patch, 1.1, NONE virtinst-0.300.3-update-serbian-trans.patch, 1.1, NONE
Cole Robinson
crobinso at fedoraproject.org
Mon Dec 1 16:24:18 UTC 2008
Author: crobinso
Update of /cvs/pkgs/rpms/python-virtinst/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22838
Modified Files:
.cvsignore python-virtinst.spec sources
Added Files:
virtinst-0.400.0-bridge-network-collision.patch
virtinst-0.400.0-disk-pool-fixes.patch
virtinst-0.400.0-fix-translated-help.patch
virtinst-0.400.0-log-fail-traceback.patch
virtinst-0.400.0-missing-variable.patch
virtinst-0.400.0-qemu-conn-check.patch
virtinst-0.400.0-refresh-storage-pool.patch
virtinst-0.400.0-update-translations.patch
virtinst-0.400.0-virt-convert-dict.patch
virtinst-0.400.0-virtio-f9.patch
virtinst-0.400.0-win64-entry.patch
Removed Files:
virtinst-0.300.3-boot-dir.patch
virtinst-0.300.3-fix-default-arch.patch
virtinst-0.300.3-fv-extraargs.patch
virtinst-0.300.3-hvm-kernel.patch virtinst-0.300.3-i18n.patch
virtinst-0.300.3-keep-qemu-cdrom.patch
virtinst-0.300.3-update-polish-trans.patch
virtinst-0.300.3-update-serbian-trans.patch
Log Message:
Update to version 0.400.0 with patches from rawhide/F10
virtinst-0.400.0-bridge-network-collision.patch:
--- NEW FILE virtinst-0.400.0-bridge-network-collision.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1223310077 14400
# Node ID 2aba69a1a16ce2eff6f115614607fda8bb3cfaaa
# Parent ca48e58d85ec52bf9eda14c01611860b79c5ff8e
Fix --bridge option to not report collision with --network (Mark McLoughlin)
diff -r ca48e58d85ec -r 2aba69a1a16c virtinst/cli.py
--- a/virtinst/cli.py Fri Oct 03 14:23:37 2008 -0400
+++ b/virtinst/cli.py Mon Oct 06 12:21:17 2008 -0400
@@ -277,24 +277,22 @@
guest.nics.append(n)
def digest_networks(conn, macs, bridges, networks, nics = 0):
- if type(bridges) != list and bridges != None:
- bridges = [ bridges ]
+ def listify(l):
+ if l is None:
+ return []
+ elif type(l) != list:
+ return [ l ]
+ else:
+ return l
- if macs is None:
- macs = []
- elif type(macs) != list:
- macs = [ macs ]
-
- if networks is None:
- networks = []
- elif type(networks) != list:
- networks = [ macs ]
+ macs = listify(macs)
+ bridges = listify(bridges)
+ networks = listify(networks)
- if bridges is not None and networks != None:
+ if bridges and networks:
fail(_("Cannot mix both --bridge and --network arguments"))
-
- if bridges != None:
+ if bridges:
networks = map(lambda b: "bridge:" + b, bridges)
# ensure we have less macs then networks. Auto fill in the remaining
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-fix-translated-help.patch:
--- NEW FILE virtinst-0.400.0-fix-translated-help.patch ---
diff -rup virtinst-0.400.0/virt-clone new/virt-clone
--- virtinst-0.400.0/virt-clone 2008-09-10 15:35:26.000000000 -0400
+++ new/virt-clone 2008-11-25 12:14:32.120055000 -0500
@@ -34,7 +34,6 @@ import locale
import virtinst.cli as cli
from virtinst.cli import fail
-from virtinst import _virtinst as _
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir)
gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1)
diff -rup virtinst-0.400.0/virt-image new/virt-image
--- virtinst-0.400.0/virt-image 2008-09-10 15:35:26.000000000 -0400
+++ new/virt-image 2008-11-25 12:14:20.822959000 -0500
@@ -36,7 +36,6 @@ from virtinst.cli import fail
import gettext
import locale
-from virtinst import _virtinst as _
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir)
gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1)
diff -rup virtinst-0.400.0/virt-install new/virt-install
--- virtinst-0.400.0/virt-install 2008-09-10 15:35:26.000000000 -0400
+++ new/virt-install 2008-11-25 12:26:26.453287000 -0500
@@ -39,7 +39,6 @@ from virtinst.cli import fail
import gettext
import locale
-from virtinst import _virtinst as _
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir)
gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1)
diff -rup virtinst-0.400.0/virt-pack new/virt-pack
--- virtinst-0.400.0/virt-pack 2008-09-10 15:35:26.000000000 -0400
+++ new/virt-pack 2008-11-25 12:14:55.294169000 -0500
@@ -40,7 +40,6 @@ import tempfile
import gettext
import locale
-from virtinst import _virtinst as _
locale.setlocale(locale.LC_ALL, '')
gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir)
gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1)
virtinst-0.400.0-log-fail-traceback.patch:
--- NEW FILE virtinst-0.400.0-log-fail-traceback.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1221578360 14400
# Node ID b39a144682b8cf372dc34aa5e64155d5ad4cb0bc
# Parent 63a843fec103157a6c4048d5486c4ba0843439a3
Log traceback (if available) from cli fail helper.
diff -r 63a843fec103 -r b39a144682b8 virtinst/cli.py
--- a/virtinst/cli.py Fri Sep 12 14:59:04 2008 -0400
+++ b/virtinst/cli.py Tue Sep 16 11:19:20 2008 -0400
@@ -106,6 +106,10 @@
def fail(msg):
"""Convenience function when failing in cli app"""
logging.error(msg)
+ import traceback
+ tb = "".join(traceback.format_exc()).strip()
+ if tb != "None":
+ logging.debug(tb)
sys.exit(1)
def nice_exit():
virtinst-0.400.0-missing-variable.patch:
--- NEW FILE virtinst-0.400.0-missing-variable.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1224170141 14400
# Node ID d920fb2662c1a2f431d4bdbb2184060c7d90cf84
# Parent 9f6f1a0111747919593704903b9247a7a70ca381
Fix missing variable error.
diff -r 9f6f1a011174 -r d920fb2662c1 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py Tue Oct 14 14:32:46 2008 -0400
+++ b/virtinst/VirtualDisk.py Thu Oct 16 11:15:41 2008 -0400
@@ -302,7 +302,7 @@
def __check_if_path_managed(self):
vol = None
- err = None
+ verr = None
pool = util.lookup_pool_by_path(self.conn,
os.path.dirname(self.path))
if pool:
virtinst-0.400.0-qemu-conn-check.patch:
--- NEW FILE virtinst-0.400.0-qemu-conn-check.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1222091168 14400
# Node ID 458daeb1a7bc65f22b0ac496202b2471dfbafc8f
# Parent f87154697807fc9002dc7aef786b8e4aa44e8c47
More thorough checking for default qemu connection.
diff -r f87154697807 -r 458daeb1a7bc virtinst/util.py
--- a/virtinst/util.py Thu Sep 18 16:44:30 2008 -0400
+++ b/virtinst/util.py Mon Sep 22 09:46:08 2008 -0400
@@ -86,7 +86,10 @@
def default_connection():
if os.path.exists("/var/lib/xend") and os.path.exists("/proc/xen"):
return "xen"
- elif os.path.exists("/usr/bin/qemu"):
+ elif os.path.exists("/usr/bin/qemu") or \
+ os.path.exists("/usr/bin/qemu-kvm") or \
+ os.path.exists("/usr/bin/kvm") or \
+ os.path.exists("/usr/bin/xenner"):
if os.getuid() == 0:
return "qemu:///system"
else:
virtinst-0.400.0-refresh-storage-pool.patch:
--- NEW FILE virtinst-0.400.0-refresh-storage-pool.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1224005406 14400
# Node ID f117c8243aa5a616f2112f9906e3fa3330e08f32
# Parent 3e2e7db24cb57416eee6f520a691ffe3abd86050
Refresh storage pool if trying to lookup a volume.
diff -r 3e2e7db24cb5 -r f117c8243aa5 virtinst/VirtualDisk.py
--- a/virtinst/VirtualDisk.py Thu Oct 09 12:35:25 2008 -0400
+++ b/virtinst/VirtualDisk.py Tue Oct 14 13:30:06 2008 -0400
@@ -300,6 +300,56 @@
"""
return (self.vol_object != None or self.vol_install != None)
+ def __check_if_path_managed(self):
+ vol = None
+ err = None
+ pool = util.lookup_pool_by_path(self.conn,
+ os.path.dirname(self.path))
+ if pool:
+ try:
+ vol = self.conn.storageVolLookupByPath(self.path)
+ except Exception, e:
+ # Pool may need to be refreshed
+ pool.refresh(0)
+ try:
+ vol = self.conn.storageVolLookupByPath(self.path)
+ except Exception, e:
+ verr = str(e)
+
+ if not vol:
+ # Path wasn't a volume. See if base of path is a managed
+ # pool, and if so, setup a StorageVolume object
+ if pool:
+ if self.size == None:
+ raise ValueError(_("Size must be specified for non "
+ "existent volume path '%s'" % \
+ self.path))
+ logging.debug("Path '%s' is target for pool '%s'. "
+ "Creating volume '%s'." % \
+ (os.path.dirname(self.path), pool.name(),
+ os.path.basename(self.path)))
+ volclass = Storage.StorageVolume.get_volume_for_pool(pool_object=pool)
+ cap = (self.size * 1024 * 1024 * 1024)
+ if self.sparse:
+ alloc = 0
+ else:
+ #alloc = cap
+ # XXX: disable setting managed storage as nonsparse
+ # XXX: since it hoses libvirtd (for now)
+ alloc = 0
+ vol = volclass(name=os.path.basename(self.path),
+ capacity=cap, allocation=alloc, pool=pool)
+ self._set_vol_install(vol, validate=False)
+ elif self._is_remote():
+ raise ValueError(_("'%s' is not managed on remote "
+ "host: %s" % (self.path, verr)))
+ else:
+ logging.debug("Didn't find path '%s' managed on "
+ "connection: %s" % (self.path, verr))
+ else:
+ self._set_vol_object(vol, validate=False)
+
+
def __validate_params(self):
"""
function to validate all the complex interaction between the various
@@ -314,51 +364,9 @@
if not storage_capable and self._is_remote():
raise ValueError, _("Connection doesn't support remote storage.")
-
if storage_capable and self.path is not None \
and not self.__storage_specified():
- vol = None
- verr = None
- try:
- vol = self.conn.storageVolLookupByPath(self.path)
- except Exception, e:
- verr = str(e)
-
- if not vol:
- # Path wasn't a volume. See if base of path is a managed
- # pool, and if so, setup a StorageVolume object
- pool = util.lookup_pool_by_path(self.conn,
- os.path.dirname(self.path))
- if pool:
- if self.size == None:
- raise ValueError(_("Size must be specified for non "
- "existent path '%s'" % self.path))
- logging.debug("Path '%s' is target for pool '%s'. "
- "Creating volume '%s'." % \
- (os.path.dirname(self.path), pool.name(),
- os.path.basename(self.path)))
- volclass = Storage.StorageVolume.get_volume_for_pool(pool_object=pool)
- cap = (self.size * 1024 * 1024 * 1024)
- if self.sparse:
- alloc = 0
- else:
- #alloc = cap
- # XXX: disable setting managed storage as nonsparse
- # XXX: since it hoses libvirtd (for now)
- alloc = 0
- vol = volclass(name=os.path.basename(self.path),
- capacity=cap, allocation=alloc,
- pool=pool)
- self._set_vol_install(vol, validate=False)
- elif self._is_remote():
- raise ValueError(_("'%s' is not managed on remote "
- "host: %s" % (self.path, verr)))
- else:
- logging.debug("Didn't find path '%s' managed on "
- "connection: %s" % (self.path, verr))
- else:
- self._set_vol_object(vol, validate=False)
-
+ self.__check_if_path_managed()
if self._is_remote() and not self.__storage_specified():
raise ValueError, _("Must specify libvirt managed storage if on "
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-virt-convert-dict.patch:
--- NEW FILE virtinst-0.400.0-virt-convert-dict.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1221245416 14400
# Node ID 1021d9c89a740b034d20e61bf4f24b68b5ef375f
# Parent 926769542d04ee9965f43b1a38087c4a48a421c7
virt-convert: Fix crash caused by accessing now private os dictionary. (Joey Boggs)
diff -r 926769542d04 -r 1021d9c89a74 virtconv/parsers/virtimage.py
--- a/virtconv/parsers/virtimage.py Fri Sep 12 14:23:11 2008 -0400
+++ b/virtconv/parsers/virtimage.py Fri Sep 12 14:50:16 2008 -0400
@@ -83,7 +83,9 @@
ostype = None
osvariant = None
- ostype = fv.OS_TYPES.get(vm.os_type)
+ # TODO: Shouldn't be directly using _OS_TYPES here. virt-image libs (
+ # ImageParser?) should handle this info
+ ostype = fv._OS_TYPES.get(vm.os_type)
if ostype:
osvariant = ostype.variants.get(vm.os_variant)
virtinst-0.400.0-virtio-f9.patch:
--- NEW FILE virtinst-0.400.0-virtio-f9.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1221590689 14400
# Node ID 6a4c3f52df1eff47011657f87818bb204227db36
# Parent e362f5306b26dd71045923c565ca4ed9e3c8d32a
Setup virtio for f9. (Francois Kooman)
diff -r e362f5306b26 -r 6a4c3f52df1e AUTHORS
--- a/AUTHORS Mon Sep 15 22:28:00 2008 +0100
+++ b/AUTHORS Tue Sep 16 14:44:49 2008 -0400
@@ -30,6 +30,7 @@
John Levon <john-dot-levon-at-sun-dot-com>
Bryan Kearney <bkearney-at-redhat-dot-com>
Guido Guenther <agx-at-sigxcpu-dot-org>
+ Francois Kooman <fkooman-at-tuxed-dot-net>
...send patches and get your name here...
diff -r e362f5306b26 -r 6a4c3f52df1e virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py Mon Sep 15 22:28:00 2008 +0100
+++ b/virtinst/FullVirtGuest.py Tue Sep 16 14:44:49 2008 -0400
@@ -75,7 +75,11 @@
"fedora6": { "label": "Fedora Core 6", "distro": "fedora" },
"fedora7": { "label": "Fedora 7", "distro": "fedora" },
"fedora8": { "label": "Fedora 8", "distro": "fedora" },
- "fedora9": { "label": "Fedora 9", "distro": "fedora" },
+ "fedora9": { "label": "Fedora 9", "distro": "fedora",
+ "devices" : {
+ "disk" : { "bus" : [ (["kvm"], "virtio") ] },
+ "net" : { "model" : [ (["kvm"], "virtio") ] }
+ }},
"fedora10": { "label": "Fedora 10", "distro": "fedora",
"devices" : {
"disk" : { "bus" : [ (["kvm"], "virtio") ] },
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 10 Mar 2008 23:57:12 -0000 1.14
+++ .cvsignore 1 Dec 2008 16:24:17 -0000 1.15
@@ -1,4 +1 @@
-.build*.log
-*.rpm
-noarch
-virtinst-0.300.3.tar.gz
+virtinst-0.400.0.tar.gz
Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- python-virtinst.spec 4 Jun 2008 20:57:11 -0000 1.43
+++ python-virtinst.spec 1 Dec 2008 16:24:17 -0000 1.44
@@ -8,27 +8,33 @@
%define appname virtinst
-Summary: Python modules for starting Xen guest installations
+Summary: Python modules and utilities for installing virtual machines
Name: python-%{appname}
-Version: 0.300.3
-Release: 7%{_extra_release}
+Version: 0.400.0
+Release: 0%{_extra_release}
Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{appname}-%{version}-keep-qemu-cdrom.patch
-Patch2: %{appname}-%{version}-fix-default-arch.patch
-Patch3: %{appname}-%{version}-fv-extraargs.patch
-Patch4: %{appname}-%{version}-update-polish-trans.patch
-Patch5: %{appname}-%{version}-i18n.patch
-Patch6: %{appname}-%{version}-update-serbian-trans.patch
-Patch7: %{appname}-%{version}-boot-dir.patch
-Patch8: %{appname}-%{version}-hvm-kernel.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
+Patch11: %{appname}-%{version}-fix-translated-help.patch
License: GPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Url: http://virt-manager.org/
-Requires: libvirt-python >= 0.4.2-3.fc9
-# Disabled to allow minimal non-X installs
-#Requires: virt-viewer
+Url: http://virt-manager.org
+Provides: virt-install
+Provides: virt-clone
+Provides: virt-image
+Provides: virt-pack
+Provides: virt-convert
+Requires: libvirt-python >= 0.4.5-2.fc9
Requires: urlgrabber
Requires: libxml2-python
Requires: python-urlgrabber
@@ -39,14 +45,10 @@
BuildRequires: gettext
%description
-virtinst is a module to help in starting installations of Fedora/Red
-Hat Enterprise Linux related distributions inside of virtual machines. It
-supports both paravirt guests (for which only FC and RHEL guests are
-currently supported) as well as fully virtualized guests. It uses
-libvirt (http://www.libvirt.org) for starting things.
-
-Also contained is a simple script virt-install which uses
-virtinst in a command line mode.
+virtinst is a module that helps build and install libvirt based virtual
+machines. Currently supports KVM, QEmu and Xen virtual machines. Package
+includes several command line utilities, including virt-install (build
+and install new VMs) and virt-clone (clone an existing virtual machine).
%prep
%setup -q -n %{appname}-%{version}
@@ -58,6 +60,9 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
%build
python setup.py build
@@ -76,9 +81,11 @@
%files -f %{appname}.lang
%defattr(-,root,root)
-%doc README AUTHORS NEWS ChangeLog doc/image.rng doc/example1.xml
+%doc README COPYING AUTHORS ChangeLog NEWS doc/image.rng doc/example1.xml
%dir %{python_sitelib}/%{appname}
+%dir %{python_sitelib}/virtconv
%{python_sitelib}/%{appname}/*
+%{python_sitelib}/virtconv/*
%{python_sitelib}/%{appname}-*.egg-info
%{_mandir}/man1/*
%{_mandir}/man5/*
@@ -86,8 +93,17 @@
%{_bindir}/virt-install
%{_bindir}/virt-clone
%{_bindir}/virt-image
+%{_bindir}/virt-pack
+%{_bindir}/virt-convert
%changelog
+* Mon Dec 1 2008 Cole Robinson <crobinso at redhat.com> - 0.400.0.fc9
+- Rebase to version 0.400.0 with F10 fixes.
+- Add virt-convert tool
+- virt-install --disk option for using/provisioning libvirt storage
+- virt-install remote installation support
+- virt-install --sound option to add soundcard emulation
+
* Wed Jun 4 2008 Daniel P. Berrange <berrange at redhat.com> - 0.300.3-7.fc9
- Fix fetching of HVM kernels (rhbz #450032)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 10 Mar 2008 23:57:12 -0000 1.14
+++ sources 1 Dec 2008 16:24:17 -0000 1.15
@@ -1 +1 @@
-6354d7c10f5167fbcc03e29280165b27 virtinst-0.300.3.tar.gz
+484792dfe05abc75082d44fc51b811f3 virtinst-0.400.0.tar.gz
--- virtinst-0.300.3-boot-dir.patch DELETED ---
--- virtinst-0.300.3-fix-default-arch.patch DELETED ---
--- virtinst-0.300.3-fv-extraargs.patch DELETED ---
--- virtinst-0.300.3-hvm-kernel.patch DELETED ---
--- virtinst-0.300.3-i18n.patch DELETED ---
--- virtinst-0.300.3-keep-qemu-cdrom.patch DELETED ---
--- virtinst-0.300.3-update-polish-trans.patch DELETED ---
--- virtinst-0.300.3-update-serbian-trans.patch DELETED ---
More information about the fedora-extras-commits
mailing list