PR#107: List all images in essentials - compose-utils

compose-utils

#107 List all images in essentials

Merged 4 years ago by lsedlar. Opened 4 years ago by lsedlar.

lsedlar/compose-utils image-types into master

List all images in essentials

Lubomír Sedlář • 4 years ago

11fda87

compose_utils/essentials.py

file modified

+3 -4

		`@@ -55,14 +55,13 @@`
		`return " * %s (%s)\n%s" % (nvr, name, "\n".join(" - %s" % r for r in sorted(repos)))`


		`- def get_images(compose, types=["qcow2"]):`
		`- """Get list of image filenames for given types."""`
		`+ def get_images(compose):`
		`+ """Get list of image filenames."""`
		`images = set()`
		`for variant in compose.images.images:`
		`for arch in compose.images.images[variant]:`
		`for image in compose.images.images[variant][arch]:`
		`- if image.type in types:`
		`- images.add(os.path.basename(image.path))`
		`+ images.add(os.path.basename(image.path))`
		`if images:`
		`return "Images:\n%s" % "\n".join(" * %s" % x for x in sorted(images))`

tests/composes/DP-1.0-20160315.t.3/COMPOSE_ID

file added

		`@@ -0,0 +1,1 @@`
		`+ DP-1.0-20160315.t.0`
		`\ No newline at end of file`

tests/composes/DP-1.0-20160315.t.3/STATUS

file added

		`@@ -0,0 +1,1 @@`
		`+ FINISHED`

tests/composes/DP-1.0-20160315.t.3/compose/metadata/composeinfo.json

file added

+134

		`@@ -0,0 +1,134 @@`
		`+ {`
		`+ "header": {`
		`+ "version": "1.0"`
		`+ },`
		`+ "payload": {`
		`+ "compose": {`
		`+ "date": "20160315",`
		`+ "id": "DP-1.0-20160315.t.3",`
		`+ "respin": 3,`
		`+ "type": "test"`
		`+ },`
		`+ "release": {`
		`+ "name": "Dummy Product",`
		`+ "short": "DP",`
		`+ "version": "1.0"`
		`+ },`
		`+ "variants": {`
		`+ "Client": {`
		`+ "arches": [`
		`+ "i386",`
		`+ "x86_64"`
		`+ ],`
		`+ "id": "Client",`
		`+ "name": "Client",`
		`+ "paths": {`
		`+ "debug_packages": {`
		`+ "i386": "Client/i386/debug/tree/Packages",`
		`+ "x86_64": "Client/x86_64/debug/tree/Packages"`
		`+ },`
		`+ "debug_repository": {`
		`+ "i386": "Client/i386/debug/tree",`
		`+ "x86_64": "Client/x86_64/debug/tree"`
		`+ },`
		`+ "debug_tree": {`
		`+ "i386": "Client/i386/debug/tree",`
		`+ "x86_64": "Client/x86_64/debug/tree"`
		`+ },`
		`+ "isos": {`
		`+ "i386": "Client/i386/iso",`
		`+ "x86_64": "Client/x86_64/iso"`
		`+ },`
		`+ "os_tree": {`
		`+ "i386": "Client/i386/os",`
		`+ "x86_64": "Client/x86_64/os"`
		`+ },`
		`+ "packages": {`
		`+ "i386": "Client/i386/os/Packages",`
		`+ "x86_64": "Client/x86_64/os/Packages"`
		`+ },`
		`+ "repository": {`
		`+ "i386": "Client/i386/os",`
		`+ "x86_64": "Client/x86_64/os"`
		`+ },`
		`+ "source_isos": {`
		`+ "i386": "Client/source/iso",`
		`+ "x86_64": "Client/source/iso"`
		`+ },`
		`+ "source_packages": {`
		`+ "i386": "Client/source/tree/Packages",`
		`+ "x86_64": "Client/source/tree/Packages"`
		`+ },`
		`+ "source_repository": {`
		`+ "i386": "Client/source/tree",`
		`+ "x86_64": "Client/source/tree"`
		`+ },`
		`+ "source_tree": {`
		`+ "i386": "Client/source/tree",`
		`+ "x86_64": "Client/source/tree"`
		`+ }`
		`+ },`
		`+ "type": "variant",`
		`+ "uid": "Client",`
		`+ "variants": []`
		`+ },`
		`+ "Server": {`
		`+ "arches": [`
		`+ "s390x",`
		`+ "x86_64"`
		`+ ],`
		`+ "id": "Server",`
		`+ "name": "Server",`
		`+ "paths": {`
		`+ "debug_packages": {`
		`+ "s390x": "Server/s390x/debug/tree/Packages",`
		`+ "x86_64": "Server/x86_64/debug/tree/Packages"`
		`+ },`
		`+ "debug_repository": {`
		`+ "s390x": "Server/s390x/debug/tree",`
		`+ "x86_64": "Server/x86_64/debug/tree"`
		`+ },`
		`+ "debug_tree": {`
		`+ "s390x": "Server/s390x/debug/tree",`
		`+ "x86_64": "Server/x86_64/debug/tree"`
		`+ },`
		`+ "isos": {`
		`+ "s390x": "Server/s390x/iso",`
		`+ "x86_64": "Server/x86_64/iso"`
		`+ },`
		`+ "os_tree": {`
		`+ "s390x": "Server/s390x/os",`
		`+ "x86_64": "Server/x86_64/os"`
		`+ },`
		`+ "packages": {`
		`+ "s390x": "Server/s390x/os/Packages",`
		`+ "x86_64": "Server/x86_64/os/Packages"`
		`+ },`
		`+ "repository": {`
		`+ "s390x": "Server/s390x/os",`
		`+ "x86_64": "Server/x86_64/os"`
		`+ },`
		`+ "source_isos": {`
		`+ "s390x": "Server/source/iso",`
		`+ "x86_64": "Server/source/iso"`
		`+ },`
		`+ "source_packages": {`
		`+ "s390x": "Server/source/tree/Packages",`
		`+ "x86_64": "Server/source/tree/Packages"`
		`+ },`
		`+ "source_repository": {`
		`+ "s390x": "Server/source/tree",`
		`+ "x86_64": "Server/source/tree"`
		`+ },`
		`+ "source_tree": {`
		`+ "s390x": "Server/source/tree",`
		`+ "x86_64": "Server/source/tree"`
		`+ }`
		`+ },`
		`+ "type": "variant",`
		`+ "uid": "Server",`
		`+ "variants": []`
		`+ }`
		`+ }`
		`+ }`
		`+ }`

tests/composes/DP-1.0-20160315.t.3/compose/metadata/images.json

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ {`
		`+ "header": {`
		`+ "version": "1.0"`
		`+ },`
		`+ "payload": {`
		`+ "compose": {`
		`+ "date": "20160315",`
		`+ "id": "DP-1.0-20160315.t.3",`
		`+ "respin": 3,`
		`+ "type": "test"`
		`+ },`
		`+ "images": {`
		`+ }`
		`+ }`
		`+ }`

tests/composes/DP-1.0-20160315.t.3/compose/metadata/modules.json

file added

+72

		`@@ -0,0 +1,72 @@`
		`+ {`
		`+ "header": {`
		`+ "type": "productmd.modules",`
		`+ "version": "1.2"`
		`+ },`
		`+ "payload": {`
		`+ "compose": {`
		`+ "date": "20190117",`
		`+ "id": "Fedora-Rawhide-20190117.n.0",`
		`+ "respin": 0,`
		`+ "type": "nightly"`
		`+ },`
		`+ "modules": {`
		`+ "Server": {`
		`+ "aarch64": {`
		`+ "fish:3:3020190116191836:602da195": {`
		`+ "metadata": {`
		`+ "context": "602da195",`
		`+ "koji_tag": "module-fish-3-3020190116191836-602da195",`
		`+ "name": "fish",`
		`+ "stream": "3",`
		`+ "uid": "fish:3:3020190116191836:602da195",`
		`+ "version": "3020190116191836"`
		`+ },`
		`+ "modulemd_path": {`
		`+ "binary": "Modular/aarch64/os/repodata/895b54407639b9836d7d2d397d7e1962f5f6c9d92e056a2e4d8a102fe1163826-modules.yaml.gz"`
		`+ },`
		`+ "rpms": [`
		`+ "fish-0:3.0.0-1.module_f30+2710+8dbb4023.aarch64"`
		`+ ]`
		`+ },`
		`+ "fish:master:3020190116160550:602da195": {`
		`+ "metadata": {`
		`+ "context": "602da195",`
		`+ "koji_tag": "module-fish-master-3020190116160550-602da195",`
		`+ "name": "fish",`
		`+ "stream": "master",`
		`+ "uid": "fish:master:3020190116160550:602da195",`
		`+ "version": "3020190116160550"`
		`+ },`
		`+ "modulemd_path": {`
		`+ "binary": "Modular/aarch64/os/repodata/895b54407639b9836d7d2d397d7e1962f5f6c9d92e056a2e4d8a102fe1163826-modules.yaml.gz"`
		`+ },`
		`+ "rpms": [`
		`+ "fish-0:3.0.0-1.module_f30+2703+82e92e7e.aarch64"`
		`+ ]`
		`+ }`
		`+ },`
		`+ "x86_64": {`
		`+ "testmodule:master:3020190115184641:a5b0195c": {`
		`+ "metadata": {`
		`+ "context": "a5b0195c",`
		`+ "koji_tag": "module-testmodule-master-3020190115184641-a5b0195c",`
		`+ "name": "testmodule",`
		`+ "stream": "master",`
		`+ "uid": "testmodule:master:3020190115184641:a5b0195c",`
		`+ "version": "3020190115184641"`
		`+ },`
		`+ "modulemd_path": {`
		`+ "binary": "Modular/x86_64/os/repodata/5ff336ba62aa170e033efc2dc9e9b372b641900eb98cd9af53738e1838d3c27a-modules.yaml.gz"`
		`+ },`
		`+ "rpms": [`
		`+ "perl-List-Compare-0:0.53-11.module_f30+2696+4b2456b0.noarch",`
		`+ "dwm-user-0:6.1-8.module_f30+2696+4b2456b0.x86_64",`
		`+ "dwm-0:6.1-8.module_f30+2696+4b2456b0.x86_64"`
		`+ ]`
		`+ }`
		`+ }`
		`+ }`
		`+ }`
		`+ }`
		`+ }`

tests/composes/DP-1.0-20160315.t.3/compose/metadata/rpms.json

file added

+563

		`@@ -0,0 +1,563 @@`
		`+ {`
		`+ "header": {`
		`+ "version": "1.0"`
		`+ },`
		`+ "payload": {`
		`+ "compose": {`
		`+ "date": "20160315",`
		`+ "id": "DP-1.0-20160315.t.3",`
		`+ "respin": 3,`
		`+ "type": "test"`
		`+ },`
		`+ "rpms": {`
		`+ "Client": {`
		`+ "i386": {`
		`+ "Dummy-firefox-0:16.0.1-1.src": {`
		`+ "Dummy-firefox-0:16.0.1-1.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/Dummy-firefox-16.0.1-1.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-firefox-0:16.0.1-1.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/Dummy-firefox-16.0.1-1.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-firefox-debuginfo-0:16.0.1-1.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/Dummy-firefox-debuginfo-16.0.1-1.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "Dummy-xulrunner-0:16.0.1-1.src": {`
		`+ "Dummy-xulrunner-0:16.0.1-1.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/Dummy-xulrunner-16.0.1-1.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-xulrunner-0:16.0.1-1.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/Dummy-xulrunner-16.0.1-1.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-xulrunner-debuginfo-0:16.0.1-1.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/Dummy-xulrunner-debuginfo-16.0.1-1.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "dummy-basesystem-0:10.0-6.noarch": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-basesystem-10.0-6.noarch.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-basesystem-10.0-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "dummy-bash-0:4.2.37-6.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-bash-4.2.37-6.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-bash-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-debuginfo-0:4.2.37-6.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/dummy-bash-debuginfo-4.2.37-6.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "dummy-filesystem-0:4.2.37-6.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-filesystem-4.2.37-6.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-filesystem-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "dummy-glibc-0:2.14-5.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-glibc-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-glibc-2.14-5.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-common-0:2.14-5.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-glibc-common-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "dummy-lvm2-0:2.02.84-4.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-lvm2-2.02.84-4.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-lvm2-2.02.84-4.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-debuginfo-0:2.02.84-4.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/dummy-lvm2-debuginfo-2.02.84-4.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-libs-0:2.02.84-4.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-lvm2-libs-2.02.84-4.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "dummy-tftp-0:5.2-6.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/i386/os/Packages/d/dummy-tftp-5.2-6.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-tftp-5.2-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-debuginfo-0:5.2-6.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/i386/debug/tree/Packages/d/dummy-tftp-debuginfo-5.2-6.i686.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ }`
		`+ },`
		`+ "x86_64": {`
		`+ "Dummy-firefox-0:16.0.1-1.src": {`
		`+ "Dummy-firefox-0:16.0.1-1.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/Dummy-firefox-16.0.1-1.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-firefox-0:16.0.1-1.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/Dummy-firefox-16.0.1-1.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-firefox-debuginfo-0:16.0.1-1.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/Dummy-firefox-debuginfo-16.0.1-1.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "Dummy-xulrunner-0:16.0.1-1.src": {`
		`+ "Dummy-xulrunner-0:16.0.1-1.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/Dummy-xulrunner-16.0.1-1.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-xulrunner-0:16.0.1-1.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/Dummy-xulrunner-16.0.1-1.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "Dummy-xulrunner-debuginfo-0:16.0.1-1.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/Dummy-xulrunner-debuginfo-16.0.1-1.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "dummy-basesystem-0:10.0-6.noarch": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-basesystem-10.0-6.noarch.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-basesystem-10.0-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-bash-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-bash-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-debuginfo-0:4.2.37-6.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-filesystem-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-filesystem-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "dummy-glibc-0:2.14-5.i686": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-glibc-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-glibc-2.14-5.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-glibc-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-common-0:2.14-5.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-glibc-common-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-lvm2-2.02.84-4.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-lvm2-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-debuginfo-0:2.02.84-4.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-lvm2-debuginfo-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-libs-0:2.02.84-4.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-lvm2-libs-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "category": "source",`
		`+ "path": "Client/source/tree/Packages/d/dummy-tftp-5.2-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Client/x86_64/os/Packages/d/dummy-tftp-5.2-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-debuginfo-0:5.2-6.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Client/x86_64/debug/tree/Packages/d/dummy-tftp-debuginfo-5.2-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ }`
		`+ }`
		`+ },`
		`+ "Server": {`
		`+ "s390x": {`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "dummy-basesystem-0:10.0-6.noarch": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-basesystem-10.0-6.noarch.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-basesystem-10.0-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "dummy-bash-0:4.2.37-6.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-bash-4.2.37-6.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-bash-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-debuginfo-0:4.2.37-6.s390x": {`
		`+ "category": "debug",`
		`+ "path": "Server/s390x/debug/tree/Packages/d/dummy-bash-debuginfo-4.2.37-6.s390x.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "dummy-filesystem-0:4.2.37-6.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-filesystem-4.2.37-6.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-filesystem-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "dummy-glibc-0:2.14-5.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-glibc-2.14-5.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-glibc-2.14-5.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-common-0:2.14-5.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-glibc-common-2.14-5.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.s390x": {`
		`+ "category": "debug",`
		`+ "path": "Server/s390x/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.s390x": {`
		`+ "category": "debug",`
		`+ "path": "Server/s390x/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.s390x.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "dummy-lvm2-0:2.02.84-4.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-lvm2-2.02.84-4.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-lvm2-2.02.84-4.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-debuginfo-0:2.02.84-4.s390x": {`
		`+ "category": "debug",`
		`+ "path": "Server/s390x/debug/tree/Packages/d/dummy-lvm2-debuginfo-2.02.84-4.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-libs-0:2.02.84-4.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-lvm2-libs-2.02.84-4.s390x.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "dummy-tftp-0:5.2-6.s390x": {`
		`+ "category": "binary",`
		`+ "path": "Server/s390x/os/Packages/d/dummy-tftp-5.2-6.s390x.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-tftp-5.2-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-debuginfo-0:5.2-6.s390x": {`
		`+ "category": "debug",`
		`+ "path": "Server/s390x/debug/tree/Packages/d/dummy-tftp-debuginfo-5.2-6.s390x.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ }`
		`+ },`
		`+ "x86_64": {`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "dummy-basesystem-0:10.0-6.noarch": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-basesystem-10.0-6.noarch.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-basesystem-0:10.0-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-basesystem-10.0-6.src.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "dummy-bash-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-bash-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-0:4.2.37-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-bash-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-bash-debuginfo-0:4.2.37-6.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "dummy-filesystem-0:4.2.37-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-filesystem-4.2.37-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-filesystem-0:4.2.37-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-filesystem-4.2.37-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "dummy-glibc-0:2.14-5.i686": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-glibc-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-glibc-2.14-5.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-0:2.14-5.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-glibc-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-common-0:2.14-5.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-glibc-common-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-0:2.14-5.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.i686": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-glibc-debuginfo-common-0:2.14-5.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "dummy-lvm2-0:2.02.84-4.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-lvm2-2.02.84-4.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-0:2.02.84-4.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-lvm2-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-debuginfo-0:2.02.84-4.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-lvm2-debuginfo-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-devel-0:2.02.84-4.i686": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-lvm2-devel-2.02.84-4.i686.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-devel-0:2.02.84-4.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-lvm2-devel-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-lvm2-libs-0:2.02.84-4.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-lvm2-libs-2.02.84-4.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "dummy-tftp-0:5.2-6.src": {`
		`+ "category": "source",`
		`+ "path": "Server/source/tree/Packages/d/dummy-tftp-5.2-6.src.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-0:5.2-6.x86_64": {`
		`+ "category": "binary",`
		`+ "path": "Server/x86_64/os/Packages/d/dummy-tftp-5.2-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ },`
		`+ "dummy-tftp-debuginfo-0:5.2-6.x86_64": {`
		`+ "category": "debug",`
		`+ "path": "Server/x86_64/debug/tree/Packages/d/dummy-tftp-debuginfo-5.2-6.x86_64.rpm",`
		`+ "sigkey": null`
		`+ }`
		`+ }`
		`+ }`
		`+ }`
		`+ }`
		`+ }`
		`+ }`

tests/test_essentials.py

file modified

+4 -4

		`@@ -17,7 +17,7 @@`

		`class GetPackageVersionTest(unittest.TestCase):`
		`def test_no_match(self):`
		`- compose = get_compose("DP-1.0-20160315.t.0")`
		`+ compose = get_compose("DP-1.0-20160315.t.3")`
		`self.assertIsNone(essentials.get_package_version(compose, "kernel"))`

		`def test_with_kernel(self):`
		`@@ -30,7 +30,7 @@`

		`class GetContainersTest(unittest.TestCase):`
		`def test_no_metadata(self):`
		`- compose = get_compose("DP-1.0-20160315.t.0")`
		`+ compose = get_compose("DP-1.0-20160315.t.3")`
		`self.assertIsNone(essentials.get_containers(compose))`

		`def test_with_containers(self):`
		`@@ -50,7 +50,7 @@`

		`class GetImagesTest(unittest.TestCase):`
		`def test_no_metadata(self):`
		`- compose = get_compose("DP-1.0-20160315.t.0")`
		`+ compose = get_compose("DP-1.0-20160315.t.3")`
		`self.assertIsNone(essentials.get_images(compose))`

		`def test_with_images(self):`
		`@@ -68,7 +68,7 @@`

		`class GetEssentialsTest(unittest.TestCase):`
		`def test_no_metadata(self):`
		`- compose_path = get_compose_path("DP-1.0-20160315.t.0")`
		`+ compose_path = get_compose_path("DP-1.0-20160315.t.3")`
		`self.assertEqual(essentials.get_essentials(compose_path), [])`

		`def test_with_metadata(self):`

tests/test_find_latest.py

file modified

		`@@ -14,6 +14,7 @@`
		`"DP-1.0-20160315.t.0",`
		`"DP-1.0-20160315.t.1",`
		`"DP-1.0-20160315.t.2",`
		`+ "DP-1.0-20160315.t.3",`
		`"DP-1.0-20160720.t.8",`
		`"DP-1.0-20181012.t.0",`
		`"Fedora-Modular-Bikeshed-20171004.n.0",`