1. 16 3月, 2018 37 次提交
  2. 15 3月, 2018 3 次提交
    • J
      lockd: fix typo in virtlockd-admin.socket · fb327ac2
      Jim Fehlig 提交于
      Commit ce7ae55e introduced a typo in virtlockd-admin socket file
      
      /usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue
      'Server' in section 'Socket'
      
      Change 'Server' to 'Service'.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      Reviewed-by: NErik Skultety <eskultet@redhat.com>
      fb327ac2
    • D
      travis: unlink python package before upgrading brew packages · 70713503
      Daniel P. Berrangé 提交于
      The 'brew upgrade' command is pulling in the python2 package which
      promptly fails due to clashing symlinks installed by the new python
      package (which is python3 based):
      
      ==> Pouring python@2-2.7.14_3.sierra.bottle.tar.gz
      Error: The `brew link` step did not complete successfully
      The formula built, but is not symlinked into /usr/local
      Could not symlink bin/2to3-2
      Target /usr/local/bin/2to3-2
      is a symlink belonging to python. You can unlink it:
        brew unlink python
      To force the link and overwrite all conflicting files:
        brew link --overwrite python@2
      To list all files that would be deleted:
        brew link --overwrite --dry-run python@2
      
      By running 'brew unlink python' we can get rid of the python3 links that
      we didn't want in the first place and avoid this error.
      
      This is the working fix for what we previously attempted todo in:
      
        commit c9c9fc90
        Author: Daniel P. Berrangé <berrange@redhat.com>
        Date:   Mon Mar 5 10:13:12 2018 +0000
      
          travis: force install of python2 into $PATH on macOS
      Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      70713503
    • D
      travis: move macOS before_install tasks into osx matrix entry · b94c9ea5
      Daniel P. Berrangé 提交于
      The list of commands we're running for the before_install task
      is rather large. We have it all on one line because we're
      wrapping it all in a test against TRAVIS_OS_NAME env variable.
      
      By moving it into the osx matrix entry we can remove the need
      for the conditional shell test. This lets us put each command
      on a separate line making the steps clear to understand.
      
      Fortunately the 'before_install' task does not have the crazy
      behaviour whereby travis ignores errors and runs all commands
      regardless, like the 'script' task does. The first command
      failing will cause an immediate stop with error status.
      Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      b94c9ea5