File chovf.patch of Package open-ovf

Index: open-ovf-0.1/py/scripts/chovf
===================================================================
--- open-ovf-0.1.orig/py/scripts/chovf
+++ open-ovf-0.1/py/scripts/chovf
@@ -12,8 +12,9 @@
 ##############################################################################
 
 import sys
-from optparse import OptionParser
 
+from ovf.commands import cli
+from ovf.commands import VERSION_STR
 from ovf import Ovf
 from ovf.OvfFile import OvfFile
 
@@ -140,31 +141,9 @@ def chLanguage(ovfFile, options):
     This function changes the language in the ovf envelope
     """
 def main():
-    usage = "usage: %prog command [options]"
-    command = None
-
-    parser = OptionParser(usage)
-    for long in commands.keys():
-        parser.add_option("--" + long, help = commands[long]['help'],
-             action="store_true")
-
-    #do the help stuff up here....
-    if len(sys.argv) > 1:
-        for long in commands:
-            if sys.argv[1] == "--" + long or sys.argv[1] == long:
-                command = long
-                break
-
-    if command == None or sys.argv[1] == "--help" or sys.argv[1] == "-h":
-        parser.parse_args(['--help'])
-        exit(command != None)
-
-    parser = OptionParser(usage)
-
-    for opt in commands[long]['args']+common:
-        parser.add_option(*opt['flags'], **opt['parms'])
-
-    (options, args) = parser.parse_args(sys.argv[2:])
+    usage = "usage: chovf command -f <Ovf file path> [options]"
+    cliParser = cli.CLI(commands, common, usage=usage, version=VERSION_STR)
+    command, options, args = cliParser.parseArgs()
 
     if options.ovfFile:
         try:
@@ -193,331 +172,331 @@ commands = {
       'args' : (
          { 'flags' : [ '-i','--ovfID' ],
            'parms' : { 'dest' : 'file_id',
-                      'help' : 'Required unique ID within the OVF.' } },
+                      'help' : "Required unique ID within the OVF." } },
          { 'flags' : [ '-n', '--href' ],
-           'parms' : { 'dest' : 'href','help':'Set the href attribute. \
-                   If no URI schema is given the href must resolve to a \
-                   file relative to the location of the OVF descriptor itself.\
-                   Two different files shall not have identical href\
-                   attributes.' }},
+           'parms' : { 'dest' : 'href','help' : "Set the href attribute. "
+                    "If no URI schema is given the href must resolve to a "
+                    "file relative to the location of the OVF descriptor "
+                    "itself. Two different files shall not have identical "
+                    " href attributes." }},
          { 'flags' : [ '-s', '--size' ],
-           'parms' : { 'dest' : 'size',"help":"The size of the file. If none\
-                       is given the size will be acquired for that file."  }},
+           'parms' : { 'dest' : 'size','help' : "The size of the file. If none"
+                       "is given the size will be acquired for that file."  }},
 
          { 'flags' : [ '-c', '--compression' ],
-           'parms' : { 'dest' : 'compression','help': "Defines the compression\
-                    of the file if any. If none is given the compression shall\
-                           be determined. Specifying 'identity', states that no\
-                            compression is used. If the href is an HTTP or\
-                            HTTPS, URI, then the compression may be specified\
-                            by the HTTP server." }},
+           'parms' : { 'dest' : 'compression','help' : "Defines the "
+                    "compression of the file if any. If none is given the "
+                    "compression shall be determined. Specifying 'identity', "
+                    "states that no compression is used. If the href is an "
+                    "HTTP or HTTPS, URI, then the compression may be "
+                    "specified by the HTTP server." }},
 
          { 'flags' : [ '-C', '--chunksize' ],
-           'parms' : { 'dest' : 'chunkSize','help':"Defines the chunkSize for\
-                    the file if any." }}
+           'parms' : { 'dest' : 'chunkSize','help' : "Defines the chunkSize "
+                    "for the file if any." }}
       )
    },
    "disk" : {
       'func':chDisk,
-      'help' : 'Creates a disk section.',
+      'help' : "Modify a disk section.",
       'args' : (
          { 'flags' : [ '-i' ],
-           'parms' : { 'dest' : 'disk_id','help': 'The id for the disk.'} },
+           'parms' : { 'dest' : 'disk_id','help' : "The id for the disk."} },
          { 'flags' : [ '-c', '--capacity' ],
-           'parms' : { 'dest' : 'capacity','help' : 'The capacity of the given\
-                    disk.' }},
+           'parms' : { 'dest' : 'capacity','help' : "The capacity of the "
+                    "given disk." }},
          { 'flags' : [ '-F','--format' ],
            'parms' : { 'dest' : 'format','help' : "Disk format." }},
          { 'flags' : [ '-r', '--fileRef' ],
            'parms' : { 'dest' : 'fileRef','help' : "File reference." }},
          { 'flags' : [ '-s', '--size' ],
-           'parms' : { 'dest' : 'populatedSize','help': "Populated Size." }},
+           'parms' : { 'dest' : 'populatedSize','help' : "Populated Size." }},
          { 'flags' : [ '-u', '--capacityAlloc' ],
-           'parms' : { 'dest' : 'capacityAllocUnits','help' : "Capacity\
-                    allocation Units." }},
+           'parms' : { 'dest' : 'capacityAllocUnits','help' : "Capacity "
+                    "allocation Units." }},
          { 'flags' : [ '-p', '--parentRef' ],
-           'parms' : { 'dest' : 'parentRef','help' : "Parent ref. In order to\
-                    specify this the parent must have already been\
-                    specified." }},
+           'parms' : { 'dest' : 'parentRef','help' : "Parent ref. In order "
+                    "to specify this the parent must have already been "
+                    "specified." }},
         { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section." }},
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section." }},
         { 'flags' : [ '-y'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information." }},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information." }},
         { 'flags' : [ '-q'],
-           'parms' : { 'dest' : 'required','help' : "Defines if the section\
-                    is required or not. Boolean values only. " },
+           'parms' : { 'dest' : 'required','help' : "Defines if the section "
+                    "is required or not. Boolean values only. " },
         }
       )
    },
   "net" : {
       'func':chNetwork,
-      'help' : 'creates a Network Section.',
+      'help' : "Modify a Network Section.",
       'args' : (
          { 'flags' : [ '-i','--netID' ],
            'parms' : { 'dest' : 'networkID', 'action':'store','help' :
-                    'Defines the unique ID for the network within the OVF.' }},
+                    "Defines the unique ID for the network within the OVF." }},
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section." }},
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section." }},
          { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information." }},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information." }},
          { 'flags' : [ '-e', '--networkName' ],
-           'parms' : { 'dest' : 'networkName',"help":"The name of the network\
-                    being created." }},
+           'parms' : { 'dest' : 'networkName',"help" : "The name of the "
+                    "network being created." }},
          { 'flags' : [ '-d', '--description' ],
-           'parms' : { 'dest' : 'description','help': "Describe the network\
-                    being created."}},
+           'parms' : { 'dest' : 'description','help' : "Describe the network "
+                    "being created."}},
       )
    },
    "deploy" : {
       'func':chDeploymentOptions,
-      'help' : 'Creates a Deploymen Options Section.',
+      'help' : "Modify a Deploymen Options Section.",
       'args' : (
          { 'flags' : [ '-i','--configID' ],
-           'parms' : { 'dest' : 'configID', 'action':'store','help' : 'Defines\
-                    the unique ID for the configuration within the OVF.' }},
+           'parms' : { 'dest' : 'configID', 'action':'store','help' : "Defines "
+                    "the unique ID for the configuration within the OVF." }},
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."}},
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."}},
          { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information." }},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information." }},
          { 'flags' : [ '-l', '--label' ],
-           'parms' : { 'dest' : 'label',"help":"The label used to describe\
-                    the configuration."}},
+           'parms' : { 'dest' : 'label',"help" : "The label used to describe "
+                    "the configuration."}},
          { 'flags' : [ '-b', '--labelID' ],
-           'parms' : { 'dest' : 'labelID','help': "The ID for the label\
-                    created."}},
+           'parms' : { 'dest' : 'labelID','help' : "The ID for the label "
+                    "created."}},
          { 'flags' : [ '-d', '--description' ],
-           'parms' : { 'dest' : 'description','help': "The description for the\
-                    given configuration."}},
+           'parms' : { 'dest' : 'description','help' : "The description for the "
+                    "given configuration."}},
          { 'flags' : [ '-c', '--descID' ],
-           'parms' : { 'dest' : 'descID','help': "The ID for the description\
-                    of the configuration created."}},
+           'parms' : { 'dest' : 'descID','help' : "The ID for the description "
+                    "of the configuration created."}},
          { 'flags' : [ '-r', '--default' ],
-           'parms' : { 'dest' : 'default','help': "Specifies if the\
-                    configuration is a default one. This is a Boolean\
-                    (True,False)"}},
+           'parms' : { 'dest' : 'default','help' : "Specifies if the "
+                    "configuration is a default one. This is a Boolean "
+                    "(True,False)"}},
       )
    },
    "vsc" : {
       'func':chVirtualSysCollection,
-      'help' : 'Creates a Virtual System Collection',
+      'help' : "Modify a Virtual System Collection",
       'args' : (
          { 'flags' : [ '-i','--vscID' ],
-           'parms' : { 'dest' : 'vscID', 'action':'store','help' : 'Defines\
-                    the unique ID for the Virtual System Collection within\
-                    the OVF.'}},
+           'parms' : { 'dest' : 'vscID', 'action':'store','help' : "Defines "
+                    "the unique ID for the Virtual System Collection within "
+                    "the OVF."}},
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."}},
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."}},
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
       )
    },
    "vs" : {
       'func':chVirtualSystem,
-      'help' : 'Creates a Virtual System.',
+      'help' : "Modify a Virtual System.",
       'args' : (
          { 'flags' : [ '-i','--vsID' ],
-           'parms' : { 'dest' : 'vsID', 'action':'store','help' : 'Defines the\
-                    unique ID for the Virtual System within the OVF.'}},
+           'parms' : { 'dest' : 'vsID', 'action':'store','help' : "Defines the "
+                    "unique ID for the Virtual System within the OVF."}},
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."} },
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."} },
       )
    },
    "virthw" : {
       'func':chVirtualHardware,
-      'help' : 'Creates a Virtual Hardware Section.',
+      'help' : "Modify a Virtual Hardware Section.",
       'args' : (
 
          { 'flags' : [ '--instanceID' ],
            'parms' : { 'dest' : 'instanceID', 'action':'store','help' :
-                      'Defines the ID of the instance of the System.' } },
+                      "Defines the ID of the instance of the System." } },
          { 'flags' : [ '-s','--sysID' ],
            'parms' : { 'dest' : 'sysID', 'action':'store','help' :
-                      'Defines the ID for the System. It should be the same ID\
-                       as the Virtual System the section is in.' } },
+                      "Defines the ID for the System. It should be the same ID "
+                       "as the Virtual System the section is in." } },
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."} },
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."} },
         { 'flags' : [ '-t','--transport'],
-           'parms' : { 'dest' : 'transport','help' : "Transport that specifies\
-                    how properties are passed to the virtual machine."} },
+           'parms' : { 'dest' : 'transport','help' : "Transport that specifies "
+                    "how properties are passed to the virtual machine."} },
         { 'flags' : [ '-d', '--description' ],
-           'parms' : { 'dest' : 'description','help': "The description for the\
-                    given configuration."} },
+           'parms' : { 'dest' : 'description','help' : "The description for the "
+                    "given configuration."} },
          { 'flags' : [ '-c', '--caption' ],
-           'parms' : { 'dest' : 'caption','help': "Caption used to describe\
-                    the Virtual Hardwre."} },
+           'parms' : { 'dest' : 'caption','help' : "Caption used to describe "
+                    "the Virtual Hardwre."} },
         { 'flags' : [ '-p', '--type' ],
-           'parms' : { 'dest' : 'type','help': "The type of the Virtual System\
-                    being described."} },
+           'parms' : { 'dest' : 'type','help' : "The type of the Virtual System "
+                    "being described."} },
       )
    },
    "resource" : {
       'func':chResources,
-      'help' : 'Define resources.',
+      'help' : "Modify resources.",
       'args' : (
          { 'flags' : [ '--virtHwType'],
-           'parms' : { 'dest' : 'virtHwType','help' : "Specifies the type for\
-                    the virtual hardware to attach the resources to."} },
+           'parms' : { 'dest' : 'virtHwType','help' : "Specifies the type for "
+                    "the virtual hardware to attach the resources to."} },
          { 'flags' : [ '--elementName'],
-           'parms' : { 'dest' : 'elementName','help' : "A human-readable\
-            description of the content. For example, '256MB memory'."} },
+           'parms' : { 'dest' : 'elementName','help' : "A human-readable "
+            "description of the content. For example, '256MB memory'."} },
          { 'flags' : [ '-k','--resourceType'],
-           'parms' : { 'dest' : 'resourceType','help' : "Specifies the kind of\
-                    device that is being described."} },
+           'parms' : { 'dest' : 'resourceType','help' : "Specifies the kind of "
+                    "device that is being described."} },
          { 'flags' : [ '-i' ,'--resourceID'],
-           'parms' : { 'dest' : 'resourceID','help': 'The id for the\
-                    resource.'} },
+           'parms' : { 'dest' : 'resourceID','help' : "The id for the "
+                    "resource."} },
          { 'flags' : [ '-d', '--description' ],
-           'parms' : { 'dest' : 'description','help' : 'A human-readable\
-                    description of the meaning of the information.'} },
+           'parms' : { 'dest' : 'description','help' : "A human-readable "
+                    "description of the meaning of the information."} },
          { 'flags' : [ '-a','--address' ],
-           'parms' : { 'dest' : 'address','help' : "Address for an Ethernet\
-                    adapter, this will be the MAC address."} },
+           'parms' : { 'dest' : 'address','help' : "Address for an Ethernet "
+                    "adapter, this will be the MAC address."} },
          { 'flags' : [ '-p', '--addressOnParent' ],
-           'parms' : { 'dest' : 'addressOnParent','help' : "For a device, this\
-                    specifies its location on the controller."} },
+           'parms' : { 'dest' : 'addressOnParent','help' : "For a device, this "
+                    "specifies its location on the controller."} },
          { 'flags' : [ '-u', '--allocUnits' ],
-           'parms' : { 'dest' : 'allocUnits','help': "Specifies the units of\
-                    allocation used. Example: 'MegaBytes'"} },
+           'parms' : { 'dest' : 'allocUnits','help' : "Specifies the units of "
+                    "allocation used. Example: 'MegaBytes'"} },
          { 'flags' : [ '-t', '--automaticAllocation' ],
            'parms' : { 'action':"store_true",'dest' : 'automaticAllocation',
-                    'help' : "For devices that are connectable, this\
-                    specifies whether the device should\
-            be connected at power on."} },
+                    'help' : "For devices that are connectable, this "
+                    "specifies whether the device should be connected at "
+                    "power on."} },
          { 'flags' : [ '-o', '--autoDealloc' ],
-           'parms' : { 'dest' : 'autoDealloc','help' : "Auto deallocate.\
-                    Boolean (True | False)"} },
+           'parms' : { 'dest' : 'autoDealloc','help' : "Auto deallocate. "
+                    "Boolean (True | False)"} },
         { 'flags' : [ '-c', '--caption' ],
-           'parms' : { 'dest' : 'caption','help' : "A human-readable\
-                    description of the content."} },
+           'parms' : { 'dest' : 'caption','help' : "A human-readable "
+                    "description of the content."} },
         { 'flags' : [ '-n','--connection'],
-           'parms' : { 'dest' : 'connection','help' : "For an Ethernet adapter\
-                   ,this specifies the abstract network connection for the\
-                    virtual machine.The network connection MUST be listed in\
-                    the NetworkSection at the outermost envelope level."} },
+           'parms' : { 'dest' : 'connection','help' : "For an Ethernet adapter,"
+                    "this specifies the abstract network connection for the "
+                    "virtual machine.The network connection MUST be listed in "
+                    "the NetworkSection at the outermost envelope level."} },
         { 'flags' : [ '-v','--consVis'],
-           'parms' : { 'dest' : 'consVis','help' : "Integer of consumer\
-                    visibility."} },
+           'parms' : { 'dest' : 'consVis','help' : "Integer of consumer "
+                    "visibility."} },
         { 'flags' : [ '-r','--hostResource'],
-           'parms' : { 'dest' : 'hostResource','help' : "Abstractly specifies\
-                    how a device shall be connecting to a resource on the\
-                    deployment platform. Allowed options are either 'true' \
-                             OR 'false'."} },
+           'parms' : { 'dest' : 'hostResource','help' : "Abstractly specifies "
+                    "how a device shall be connecting to a resource on the "
+                    "deployment platform. Allowed options are either 'true' "
+                    "OR 'false'."} },
         { 'flags' : [ '-l','--limit'],
-           'parms' : { 'dest' : 'limit','help' : "Specifies the maximum\
-                    quantity  or resources  that will be granted."} },
+           'parms' : { 'dest' : 'limit','help' : "Specifies the maximum "
+                    "quantity  or resources  that will be granted."} },
         { 'flags' : [ '-m','--mapBehavior'],
            'parms' : { 'dest' : 'mapBehavior','help' : "Map behavior."} },
          { 'flags' : [ '-e','--otherResourceType'],
-           'parms' : { 'dest' : 'otherResourceType','help' : "Specifies the\
-                    kind of device that is being described."} },
+           'parms' : { 'dest' : 'otherResourceType','help' : "Specifies the "
+                    "kind of device that is being described."} },
         { 'flags' : [ '-j','--parent'],
-           'parms' : { 'dest' : 'parent','help' : "The instanceId of the\
-                    parent controller."} },
+           'parms' : { 'dest' : 'parent','help' : "The instanceId of the "
+                    "parent controller."} },
         { 'flags' : [ '-w','--poolID'],
-           'parms' : { 'dest' : 'poolID','help' : "The instanceId of the\
-                    parent controller."} },
+           'parms' : { 'dest' : 'poolID','help' : "The instanceId of the "
+                    "parent controller."} },
         { 'flags' : [ '-z','--reservation'],
-           'parms' : { 'dest' : 'reservation','help' : "Specifies the minimum\
-                    quantity of resources guranteed to be available."} },
+           'parms' : { 'dest' : 'reservation','help' : "Specifies the minimum "
+                    "quantity of resources guranteed to be available."} },
         { 'flags' : [ '-b','--resourceSubtype'],
-           'parms' : { 'dest' : 'resourceSubtype','help' : "Specifies the kind\
-                    of device that is being described."} },
+           'parms' : { 'dest' : 'resourceSubtype','help' : "Specifies the kind "
+                    "of device that is being described."} },
         { 'flags' : [ '-g','--virtualQuantity'],
-           'parms' : { 'dest' : 'virtualQuantity','help' : "Specifies the\
-                    quantity of resources presented."} },
+           'parms' : { 'dest' : 'virtualQuantity','help' : "Specifies the "
+                    "quantity of resources presented."} },
          { 'flags' : [ '-s','--weight'],
-           'parms' : { 'dest' : 'weight','help' : "Specifies the relative\
-                    priority for this allocation in relation to other\
-                    allocations."} },
+           'parms' : { 'dest' : 'weight','help' : "Specifies the relative "
+                    "priority for this allocation in relation to other "
+                    "allocations."} },
         { 'flags' : [ '-y','--required'],
-           'parms' : { 'action':"store_true",'dest' : 'required','help'
-                    : "Specifies if the section is required. Boolean\
-                    (True | False)."} },
+           'parms' : { 'action':"store_true",'dest' : 'required','help' :
+                    "Specifies if the section is required. Boolean "
+                    "(True | False)."} },
         { 'flags' : ['--config'],
-           'parms' : { 'dest' : 'config','help' : "A comma-separated list of\
-                    configuration names."} },
+           'parms' : { 'dest' : 'config','help' : "A comma-separated list of "
+                    "configuration names."} },
         { 'flags' : [ '-x','--bound'],
-           'parms' : { 'dest' : 'bound','help' : "Specify ranges of the Item\
-                    element. The ONLY valid values are \
-                      'min','max','normal'."} },
+           'parms' : { 'dest' : 'bound','help' : "Specify ranges of the Item "
+                    "element. The ONLY valid values are "
+                    "'min','max','normal'."} },
       )
    },
    "resAlloc" : {
       'func':chResourceAlloc,
-      'help' : "Creates a Resource Allocation Section. ",
+      'help' : "Modify a Resource Allocation Section.",
       'args' : (
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
         { 'flags' : ['-c','--config'],
-           'parms' : { 'dest' : 'config','help' : "A comma-separated list of\
-                    configuration names."} },
+           'parms' : { 'dest' : 'config','help' : "A comma-separated list of "
+                    "configuration names."} },
         { 'flags' : [ '-x','--bound'],
-           'parms' : { 'dest' : 'bound','help' : "Specify ranges of the Item\
-                    element. The ONLY valid values are \
-                      'min','max','normal'."} },
+           'parms' : { 'dest' : 'bound','help' : "Specify ranges of the Item "
+                    "element. The ONLY valid values are "
+                    "'min','max','normal'."} },
       ),
    },
    "annotate" : {
       'func':chAnnotationSection,
-      'help' : "Creates Annotation Section.",
+      'help' : "Modify Annotation Section.",
       'args' : (
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
         { 'flags' : ['-a','--annotation'],
-           'parms' : { 'dest' : 'annotation','help' : "The text for the\
-                    annotation."} },
+           'parms' : { 'dest' : 'annotation','help' : "The text for the "
+                    "annotation."} },
 
       ),
    },
    "product" : {
       'func':chProductSection,
-      'help' : "Creates the Product Section.",
+      'help' : "Modify the Product Section.",
       'args' : (
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
         { 'flags' : ['-p','--product'],
-           'parms' : { 'dest' : 'product','help' : "This is the product being\
-                    described in the section."} },
+           'parms' : { 'dest' : 'product','help' : "This is the product being "
+                    "described in the section."} },
         { 'flags' : ['-v','--productVersion'],
-           'parms' : { 'dest' : 'productVersion','help' : "The version of the\
-                    product."} },
+           'parms' : { 'dest' : 'productVersion','help' : "The version of the "
+                    "product."} },
         { 'flags' : ['-c','--classDesc'],
-           'parms' : { 'dest' : 'classDesc','help' : "Unique identifier for\
-                    the software product using the reverse domain name\
-                    convention. Example: com.xen.tools. If more than one\
-                    product section is present then classDesc and instance\
-                    must be defined."} },
+           'parms' : { 'dest' : 'classDesc','help' : "Unique identifier for "
+                    "the software product using the reverse domain name "
+                    "convention. Example: com.xen.tools. If more than one "
+                    "product section is present then classDesc and instance "
+                    "must be defined."} },
         { 'flags' : ['-n','--instance'],
-           'parms' : { 'dest' : 'instance','help' : "The instance of the\
-                    product section. Example: com.xen.tools.1."} },
+           'parms' : { 'dest' : 'instance','help' : "The instance of the "
+                    "product section. Example: com.xen.tools.1."} },
         { 'flags' : ['-d','--vendor'],
            'parms' : { 'dest' : 'vendor',
                       'help' : "The vendor for the product."} },
@@ -539,104 +518,104 @@ commands = {
    },
    "property" : {
       'func':chProperty,
-      'help' : "Creates a Property for the Product Section. ",
+      'help' : "Modify a Property in the Product Section.",
       'args' : (
         { 'flags' : [ '-r', '--req' ],
            'parms' : { 'action':"store_true",'dest' : 'required',
                       'help' : "Specify if the section is required."} },
         { 'flags' : ['-s','--classDesc'],
-           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to\
-                    identify Product Section. Unique identifier for the\
-                    software product using the reverse domain name convention.\
-                    Example: com.xen.tools. If more than one product section\
-                    is present then classDesc and instance must be defined."}},
+           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to "
+                    "identify Product Section. Unique identifier for the "
+                    "software product using the reverse domain name convention. "
+                    "Example: com.xen.tools. If more than one product section "
+                    "is present then classDesc and instance must be defined."}},
         { 'flags' : ['-n','--instance'],
-           'parms' : { 'dest' : 'instance','help' : "Must be provided to\
-                    identify Product Section. The instance of the product\
-                    section. Example: com.xen.tools.1."} },
+           'parms' : { 'dest' : 'instance','help' : "Must be provided to "
+                    "identify Product Section. The instance of the product "
+                    "section. Example: com.xen.tools.1."} },
         { 'flags' : [ '-t','--type'],
-           'parms' : { 'dest' : 'type','help' : "For the property of the\
-                    product this specifies the type for the section."}},
+           'parms' : { 'dest' : 'type','help' : "For the property of the "
+                    "product this specifies the type for the section."}},
         { 'flags' : ['-v','--value'],
-           'parms' : { 'dest' : 'value','help' : "For the property of the\
-                    product this specifies the value for the section."} },
+           'parms' : { 'dest' : 'value','help' : "For the property of the "
+                    "product this specifies the value for the section."} },
         { 'flags' : [ '-c','--userConfig'],
            'parms' : {'action':"store_true", 'dest' : 'userConfig',
-                    'help' : "For the property of the product this is a\
-                    boolean value that specifies if this section is user\
-                    configurable."} },
+                    'help' : "For the property of the product this is a "
+                    "boolean value that specifies if this section is user "
+                    "configurable."} },
         { 'flags' : [ '-l', '--label' ],
-           'parms' : { 'dest' : 'label',"help":"For the property of the\
-                    product this specifies the label used to describe the\
-                    configuration."}},
+           'parms' : { 'dest' : 'label',"help" : "For the property of the "
+                    "product this specifies the label used to describe the "
+                    "configuration."}},
         { 'flags' : [ '-b', '--labelID' ],
-           'parms' : { 'dest' : 'labelID','help': "For the property of the\
-            product this specifies the ID for the label created."}},
+           'parms' : { 'dest' : 'labelID','help' : "For the property of the "
+                    "product this specifies the ID for the label created."}},
         { 'flags' : [ '-d', '--description' ],
-           'parms' : { 'dest' : 'description','help': "For the property of the\
-            product this specifies the description for the given\
-             configuration."}},
+           'parms' : { 'dest' : 'description','help' : "For the property of the "
+                    "product this specifies the description for the given "
+                    "configuration."}},
         { 'flags' : [ '-e', '--descID' ],
-           'parms' : { 'dest' : 'descID','help': "For the property of the\
-            product this specifies the ID for the description of the\
-             configuration created."}},
+           'parms' : { 'dest' : 'descID','help' : "For the property of the "
+                    "product this specifies the ID for the description of the "
+                    "configuration created."}},
             { 'flags' : [ '-k', '--key' ],
-           'parms' : { 'dest' : 'key','help': "For the property of the product\
-            this specifies the key."}},
+           'parms' : { 'dest' : 'key','help' : "For the property of the product "
+                    "this specifies the key."}},
       ),
    },
    "category" : {
       'func':chCategory,
-      'help' : 'Creates Creates the category that helps define a product\
-       section.',
+      'help' : "Modify the category that helps define a product section.",
       'args' : (
         { 'flags' : ['-s','--classDesc'],
-           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to\
-            identify Product Section. Unique identifier for the software\
-            product using the reverse domain name convention. Example:\
-            com.xen.tools. If more than one product section is present then\
-            classDesc and instance must be defined."} },
+           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to "
+                    "identify Product Section. Unique identifier for the "
+                    "software product using the reverse domain name "
+                    "convention. Example: com.xen.tools. If more than one "
+                    "product section is present then classDesc and instance "
+                    "must be defined."} },
         { 'flags' : ['-n','--instance'],
-           'parms' : { 'dest' : 'instance','help' : "Must be provided to\
-            identify Product Section. The instance of the product section.\
-             Example: com.xen.tools.1."} },
+           'parms' : { 'dest' : 'instance','help' : "Must be provided to "
+                    "identify Product Section. The instance of the product "
+                    "section. Example: com.xen.tools.1."} },
         { 'flags' : ['-c','--category' ],
            'parms' : { 'dest' : 'category', 'action':'store',
-                      'help' : 'Description of the category.'}},
+                      'help' : "Description of the category."}},
 
       )
    },
    "icon" : {
       'func':chIconType,
-      'help' : 'Creates Creates the category that helps define a product\
-       section.',
+      'help' : "Modify the category that helps define a product section.",
       'args' : (
         { 'flags' : ['-n','--fileRef'],
-           'parms' : { 'dest' : 'fileRef','help' : "The file reference for the\
-            given icon."} },
+           'parms' : { 'dest' : 'fileRef','help' : "The file reference for the "
+                    "given icon."} },
         { 'flags' : ['--height'],
            'parms' : { 'dest' : 'height','help' : "The heigh of the image."}},
         { 'flags' : ['-w','--width' ],
-           'parms' : { 'dest' : 'width', 'action':'store','help' : 'The width\
-            of the image.'}},
+           'parms' : { 'dest' : 'width', 'action':'store','help' : "The width "
+                   "of the image."}},
         { 'flags' : ['-t','--mimeType' ],
-           'parms' : { 'dest' : 'mimeType', 'action':'store','help' : 'The\
-            mimeType of the image.'}},
+           'parms' : { 'dest' : 'mimeType', 'action':'store','help' : "The "
+                    "mimeType of the image."}},
          { 'flags' : ['-s','--classDesc'],
-           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to\
-            identify Product Section. Unique identifier for the software\
-             product using the reverse domain name convention.\
-             Example: com.xen.tools. If more than one product section is\
-             present then classDesc and instance must be defined."} },
+           'parms' : { 'dest' : 'classDesc','help' : "Must be provided to "
+                    "identify Product Section. Unique identifier for the "
+                    "software product using the reverse domain name "
+                    "convention. Example: com.xen.tools. If more than one "
+                    "product section is present then classDesc and instance "
+                    "must be defined."} },
         { 'flags' : ['--instance'],
-           'parms' : { 'dest' : 'instance','help' : "Must be provided to\
-            identify Product Section. The instance of the product section.\
-             Example: com.xen.tools.1."} },
+           'parms' : { 'dest' : 'instance','help' : "Must be provided to "
+                    "identify Product Section. The instance of the product "
+                    "section. Example: com.xen.tools.1."} },
       )
    },
     "license" : {
       'func':chEulaSection,
-      'help' : "Create the legal temrs for using a particular entity. ",
+      'help' : "Modify the legal terms for using a particular entity.",
       'args' : (
          { 'flags' : [ '-m', '--info' ],
            'parms' : { 'dest' : 'info',
@@ -654,64 +633,64 @@ commands = {
    },
    "startup" : {
       'func':chStartup,
-      'help' : "Create the startup section for either a Virtual System or a\
-               Virtual System Collection. ",
+      'help' : "Modify the startup section for either a Virtual System or a "
+               "Virtual System Collection.",
       'args' : (
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."} },
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."} },
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                    information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
         { 'flags' : ['-n','--entityName'],
-           'parms' : { 'dest' : 'entityName','help' : "The entity name within\
-                    a collection."} },
+           'parms' : { 'dest' : 'entityName','help' : "The entity name within "
+                    "a collection."} },
         { 'flags' : [ '-o','--order'],
-           'parms' : { 'dest' : 'order','help' : "Specifies the startup order,\
-                    starting from 0. Items with same order identifier may be\
-                    started up concurrently. The order is reversed for\
-                    shutdown. Default order is 0.."} },
+           'parms' : { 'dest' : 'order','help' : "Specifies the startup order, "
+                    "starting from 0. Items with same order identifier may be "
+                    "started up concurrently. The order is reversed for "
+                    "shutdown. Default order is 0.."} },
        { 'flags' : ['-s','--startDelay'],
-           'parms' : { 'dest' : 'startDelay','help' : "Supported only for a\
-                    Virtual System. Specifies a delay in seconds to wait until\
-                     proceeding to the next order in the start sequence.\
-                        Default is 0."} },
+           'parms' : { 'dest' : 'startDelay','help' : "Supported only for a "
+                    "Virtual System. Specifies a delay in seconds to wait until "
+                     "proceeding to the next order in the start sequence. "
+                     "Default is 0."} },
        { 'flags' : ['-w','--waitForGuest'],
            'parms' : { 'action': 'store_true','dest' : 'waitForGuest',
-                    'help' : " Supported only for a Virtual System. Allows\
-                    the platform to resume the startup sequence after the\
-                    guest has reported is ready. Default is False.."} },
+                    'help' : " Supported only for a Virtual System. Allows "
+                    "the platform to resume the startup sequence after the "
+                    "guest has reported is ready. Default is False.."} },
        { 'flags' : [ '-t', '--startAction' ],
            'parms' : { 'dest' : 'startAction',
-                      'help' : "Supported only for a Virtual System. Specifies\
-                      the the start action to use. Valid values are 'powerOn'\
-                      and none.The default value is 'powerOn'."} },
+                      'help' : "Supported only for a Virtual System. Specifies "
+                      "the the start action to use. Valid values are 'powerOn' "
+                      "and none.The default value is 'powerOn'."} },
        { 'flags' : [ '-p', '--stopDelay' ],
-           'parms' : { 'dest' : 'stopDelay','help' : "Supported only for a\
-                    Virtual System. Specifies a delay in seconds to wait until\
-                    proceeding to the previous order in the sequence. The\
-                    default is 0."} },
+           'parms' : { 'dest' : 'stopDelay','help' : "Supported only for a "
+                    "Virtual System. Specifies a delay in seconds to wait until "
+                    "proceeding to the previous order in the sequence. The "
+                    "default is 0."} },
        { 'flags' : [ '-a', '--stopAction' ],
-           'parms' : { 'dest' : 'stopAction','help' : "Supported only for a\
-                    Virtual System.. Specifies the stop action to use. Valid\
-                    values are 'powerOff' ,'guestShutdown', and 'none'. The\
-                    default is 'powerOff'."} },
+           'parms' : { 'dest' : 'stopAction','help' : "Supported only for a "
+                    "Virtual System.. Specifies the stop action to use. Valid "
+                    "values are 'powerOff' ,'guestShutdown', and 'none'. The "
+                    "default is 'powerOff'."} },
       ),
    },
 
    "os" : {
       'func':chOperatingSystem,
-      'help' : 'Creates the operating systems section for a Virtual System.',
+      'help' : "Modify the operating systems section for a Virtual System.",
       'args' : (
          { 'flags' : [ '-i','--descriptionID' ],
            'parms' : { 'dest' : 'descriptionID', 'action':'store',
-                      'help' : 'The id for the description.'}},
+                      'help' : "The id for the description."}},
          { 'flags' : [ '-d','--description' ],
            'parms' : { 'dest' : 'description', 'action':'store',
-                      'help' : 'The description of the operating system..'}},
+                      'help' : "The description of the operating system."}},
          { 'flags' : [ '-n','--name' ],
            'parms' : { 'dest' : 'name', 'action':'store',
-                      'help' : 'Unique name for the section.'}},
+                      'help' : "Unique name for the section."}},
          { 'flags' : [ '-m', '--info' ],
            'parms' : { 'dest' : 'info',
                       'help' : "The information to describe the section."}},
@@ -722,28 +701,28 @@ commands = {
    },
     "install" : {
       'func':chInstallSection,
-      'help' : 'Creates the install section used to describe a virtual system\
-               in a virtual system collection.',
+      'help' : "Modify the install section used to describe a virtual system "
+               "in a virtual system collection.",
       'args' : (
          { 'flags' : [ '-i','--initBoot' ],
            'parms' : { 'dest' : 'initBoot', 'action':'store_true',
-                      'help' : 'Specifies if the virtual machine needs to be\
-                        initially booted to install and configure software.'}},
+                      'help' : "Specifies if the virtual machine needs to be "
+                    "initially booted to install and configure software."}},
          { 'flags' : [ '-b','--bootStopdelay' ],
            'parms' : { 'dest' : 'bootStopdelay', 'action':'store',
-                      'help' : 'Specifies a delay in seconds to wait for the\
-                       virtual machine to power off.'}},
+                      'help' : "Specifies a delay in seconds to wait for the "
+                    "virtual machine to power off."}},
          { 'flags' : [ '-m', '--info' ],
-           'parms' : { 'dest' : 'info','help' : "The information to describe\
-                    the section."}},
+           'parms' : { 'dest' : 'info','help' : "The information to describe "
+                    "the section."}},
         { 'flags' : [ '-y','--infoID'],
-           'parms' : { 'dest' : 'infoID','help' : "The id of the section's\
-                information."}},
+           'parms' : { 'dest' : 'infoID','help' : "The id of the section's "
+                    "information."}},
       )
    },
     "lang" : {
       'func':chLanguage,
-      'help' : "Change the language of the OVF.",
+      'help' : "Modify the language of the OVF.",
       'args' : (
          { 'flags' : [ '-l', '--language'],
            'parms' : { 'dest' : 'language','action':"store",
@@ -755,24 +734,24 @@ commands = {
 }
 common = (
    { 'flags' : [ '--comment' ],
-     'parms' : { 'dest' : 'comment', 'help': 'Comment to add.' }
+     'parms' : { 'dest' : 'comment', 'help': "Comment to add." }
    },
    { 'flags' : [ '--encoding' ],
            'parms' : { 'dest' : 'encoding',
-                      'help' : 'Defines the encoding used for the OVF.' }
+                      'help' : "Defines the encoding used for the OVF." }
     },
    { 'flags' : ['--secID' ],
-     'parms' : { 'dest' : 'secID','help':'OVF id of the section.'} ,
+     'parms' : { 'dest' : 'secID','help' : "OVF id of the section."} ,
    },
    { 'flags' : [ '--v', '--version' ],
      'parms' : { 'dest' : 'ovfVersion','action':"store_true",'default': False,
-                'help':'OVF specification used.'} ,
+                'help' : "OVF specification used."} ,
    },
    { 'flags' : [ '-f', '--file' ],
-     'parms' : { 'dest' : 'ovfFile', 'help': 'Target OVF.' }
+     'parms' : { 'dest' : 'ovfFile', 'help': "Target OVF." }
    },
    { 'flags' : [ '--id' ],
-     'parms' : { 'dest' : 'id','help':'ID of the section to attach to.'}
+     'parms' : { 'dest' : 'id','help' : "ID of the section to attach to."}
    }
 )
 
openSUSE Build Service is sponsored by