Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/242'

Browse Source 
* origin/pr/242:
  Drop async future check with python3 version
  tracis-ci: add support for fc29 dom0
This commit is contained in:
Marek Marczykowski-Górecki 2018-11-24 14:43:43 +01:00
commit d1e20e5178
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -12,6 +12,7 @@ script:
- ~/qubes-builder/scripts/travis-build - ~/qubes-builder/scripts/travis-build
env: env:
- DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
after_success: after_success:
- codecov -F unittests - codecov -F unittests

6
qubes/tools/qubesd_query.py
View File

@ -7,12 +7,6 @@ import sys
QUBESD_SOCK = '/var/run/qubesd.sock' QUBESD_SOCK = '/var/run/qubesd.sock'
try:
asyncio.ensure_future
except AttributeError:
# pylint: disable=no-member
asyncio.ensure_future = asyncio.async
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='low-level qubesd interrogation tool') description='low-level qubesd interrogation tool')