openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update diskimage-builder from branch 'master'
  - Merge "pip-and-virtualenv: fix install-pip when centos-release-openstack is enabled"
  - pip-and-virtualenv: fix install-pip when centos-release-openstack is enabled
    
    When RDO projects repository is installed, the python-setuptools
    package is obsoleted by python2-setuptools, this makes the install-pip
    script failed:
    
      Package python-setuptools-0.9.8-7.el7.noarch is obsoleted by
      python2-setuptools-22.0.5-1.el7.noarch which is already installed
    
    Then the "rpm -ql python-setuptools | xargs rm -rf" exit 1.  Check if
    we have a record of the updated package obsoleting then old one; if
    so, use it.
    
    Change-Id: I2b0051bd9e81908c187098a7b82e120b999b111d
This commit is contained in:
Zuul 2018-04-23 02:07:51 +00:00 committed by Gerrit Code Review
parent a8ac8f950b
commit 4f80dc2a05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage-builder

@ -1 +1 @@
Subproject commit 4a9fe4b133459286fd32c51b919d2e537dbf882d
Subproject commit d2b03eefe883943f531fb454854c3097847d558f