Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: bf20b675cc5a2568f1105c3577663978c5a13108 https://github.com/qemu/qemu/commit/bf20b675cc5a2568f1105c3577663978c5a13108 Author: Eduardo Habkost <ehabk...@redhat.com> Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths: M scripts/qmp/qemu-ga-client M scripts/qmp/qmp M scripts/qmp/qmp-shell M scripts/qmp/qom-fuse M scripts/qmp/qom-get M scripts/qmp/qom-list M scripts/qmp/qom-set M scripts/qmp/qom-tree Log Message: ----------- Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import" Since commit 068cf7a44cd4d65c05aa877dbebced295be5ce44, qmp-shell is broken: $ ./scripts/qmp/qmp-shell Traceback (most recent call last): File "./scripts/qmp/qmp-shell", line 70, in <module> from . import qmp ValueError: Attempted relative import in non-package Relative imports don't work on scripts that are executed directly, so revert the change on the scripts inside scripts/qmp. Fixes: 068cf7a44cd4d65c05aa877dbebced295be5ce44 Reported-by: John Snow <js...@redhat.com> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> Message-Id: <20180621175451.7948-1-ehabk...@redhat.com> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> Commit: 518d23a976b7dad77cfef3e41c3531ac89229b00 https://github.com/qemu/qemu/commit/518d23a976b7dad77cfef3e41c3531ac89229b00 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2018-06-23 (Sat, 23 Jun 2018) Changed paths: M scripts/qmp/qemu-ga-client M scripts/qmp/qmp M scripts/qmp/qmp-shell M scripts/qmp/qom-fuse M scripts/qmp/qom-get M scripts/qmp/qom-list M scripts/qmp/qom-set M scripts/qmp/qom-tree Log Message: ----------- Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging Python queue, 2018-06-22 * Partially revert commit that broke qmp-shell and other scripts inside ./scripts/qmp # gpg: Signature made Fri 22 Jun 2018 19:47:23 BST # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabk...@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import" Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/f28d0dfdce57...518d23a976b7 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.