Check-in [416aa92d0a]
Not logged in
Overview
Comment:Fixed parsing of device list in cdrom command
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 416aa92d0ab7805eeb26f0f0b8440ac11042eb73
User & Date: vitus on 2019-10-04 07:39:41
Other Links: manifest | tags
Context
2019-10-04
08:37
Make sendkey command send several keys at once. Updated list of keys in the documentation mentioned all alphanumeric keys check-in: 9e38c1fca9 user: vitus tags: trunk
07:39
Fixed parsing of device list in cdrom command check-in: 416aa92d0a user: vitus tags: trunk
2019-10-03
10:26
Fixed random mac generation for python3 check-in: 7eafff75ba user: vitus tags: trunk
Changes

Modified vws from [b6f31d3d5f] to [73ceee4773].

336
337
338
339
340
341
342




343
344
345
346
347










348
349
350
351
352
353
354
336
337
338
339
340
341
342
343
344
345
346





347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363







+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+







        cmd_stop(options)

def cmd_cdrom(options):
    """ vws cdrom """
    if options.id  is None:
        # Search for devices which could be interpreted as CDROM
        devlist = send_command(options.sock, "info block")
        idx = devlist.find("info block")
        if idx != -1:
            devlist=devlist[devlist.find("\n",idx)+1:]
        for dev in  devlist.split("\r\n\r\n"):
        for dev in  re.findall("([-\\w]+): [^\n]+\n    Removable device:",
                               devlist):
            if re.search("cd", dev):
                options.id = dev
                break
            if dev.find("\n    Removable device: ") == -1:
                continue
            if dev.startswith("floppy"):
                continue
            dev_id = dev[:dev.find(":")]    
            idx = dev_id.find(" ")
            if idx !=  -1:
                dev_id = dev[:idx]
            options.id = dev_id    
            break    
    if options.id is None:
        print("No CDROM device found among:\n" + devlist, file=sys.stderr)
        return 1
    if options.file == "":
        print("Please specify either --eject or iso image", file=sys.stderr)
        return 1
    if options.file is None: