Hello community, here is the log from the commit of package diskimage-builder for openSUSE:Factory checked in at 2019-03-10 09:36:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old) and /work/SRC/openSUSE:Factory/.diskimage-builder.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder" Sun Mar 10 09:36:46 2019 rev:21 rq:682594 version:2.20.3 Changes: -------- --- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes 2019-02-27 15:05:49.526452918 +0100 +++ /work/SRC/openSUSE:Factory/.diskimage-builder.new.28833/diskimage-builder.changes 2019-03-10 09:36:56.992153618 +0100 @@ -1,0 +2,10 @@ +Fri Mar 1 15:40:31 UTC 2019 - Markos Chandras <[email protected]> + +- Version bump to 2.20.3 + * Update gentoo-releng gpg key + * Fix opensuse 42.3 pip-and-virtualenv + * Keep git after ironic-agent post + * set rhel minor release + * update spelling errors + +------------------------------------------------------------------- Old: ---- diskimage-builder-2.20.1.tar.gz New: ---- diskimage-builder-2.20.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diskimage-builder.spec ++++++ --- /var/tmp/diff_new_pack.8MxldU/_old 2019-03-10 09:36:57.612153470 +0100 +++ /var/tmp/diff_new_pack.8MxldU/_new 2019-03-10 09:36:57.612153470 +0100 @@ -20,7 +20,7 @@ # are only ever run inside the disk image build chroot). %global __requires_exclude_from ^%{python3_sitelib}/diskimage_builder/elements/.*$ Name: diskimage-builder -Version: 2.20.1 +Version: 2.20.3 Release: 0 Summary: Image Building Tools for OpenStack License: Apache-2.0 ++++++ diskimage-builder-2.20.1.tar.gz -> diskimage-builder-2.20.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/AUTHORS new/diskimage-builder-2.20.3/AUTHORS --- old/diskimage-builder-2.20.1/AUTHORS 2019-02-14 03:14:32.000000000 +0100 +++ new/diskimage-builder-2.20.3/AUTHORS 2019-02-28 07:50:11.000000000 +0100 @@ -173,6 +173,7 @@ Pierre Riteau <[email protected]> Pierre Riteau <[email protected]> Pino Toscano <[email protected]> +Quique Llorente <[email protected]> Rafael Folco <[email protected]> Rafael Folco <[email protected]> Ralf Haferkamp <[email protected]> @@ -267,6 +268,7 @@ tanlin <[email protected]> vmud213 <[email protected]> wangqi <[email protected]> +weiyj <[email protected]> xhzhf <[email protected]> yogananth subramanian <[email protected]> zhang.lei <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/ChangeLog new/diskimage-builder-2.20.3/ChangeLog --- old/diskimage-builder-2.20.1/ChangeLog 2019-02-14 03:14:32.000000000 +0100 +++ new/diskimage-builder-2.20.3/ChangeLog 2019-02-28 07:50:11.000000000 +0100 @@ -1,6 +1,18 @@ CHANGES ======= +2.20.3 +------ + +* Update gentoo-releng gpg key + +2.20.2 +------ + +* Fix opensuse 42.3 pip-and-virtualenv +* Keep git after ironic-agent post +* set rhel minor release + 2.20.1 ------ @@ -22,6 +34,7 @@ ------ * change to python36 for gentoo +* update spelling errors * source-repositories: Replace documentation http with https links * Delete the duplicate words in 50-zipl * Change phase to check for dracut-regenerate in iscsi-boot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/PKG-INFO new/diskimage-builder-2.20.3/PKG-INFO --- old/diskimage-builder-2.20.1/PKG-INFO 2019-02-14 03:14:33.000000000 +0100 +++ new/diskimage-builder-2.20.3/PKG-INFO 2019-02-28 07:50:12.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.20.1 +Version: 2.20.3 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/debootstrap/root.d/08-debootstrap new/diskimage-builder-2.20.3/diskimage_builder/elements/debootstrap/root.d/08-debootstrap --- old/diskimage-builder-2.20.1/diskimage_builder/elements/debootstrap/root.d/08-debootstrap 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/debootstrap/root.d/08-debootstrap 2019-02-28 07:49:08.000000000 +0100 @@ -51,7 +51,7 @@ # Have to --include=busybox because initramfs needs it if [ $(dpkg --print-architecture) != ${ARCH} ]; then - # Target architecture diffrent from host architecture: + # Target architecture different from host architecture: # there is the need to call 'qemu-debootstrap'. DEBOOTSTRAP_QEMU="qemu-" fi Binary files old/diskimage-builder-2.20.1/diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg and new/diskimage-builder-2.20.3/diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/gentoo/finalise.d/99-cleanup new/diskimage-builder-2.20.3/diskimage_builder/elements/gentoo/finalise.d/99-cleanup --- old/diskimage-builder-2.20.1/diskimage_builder/elements/gentoo/finalise.d/99-cleanup 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/gentoo/finalise.d/99-cleanup 2019-02-28 07:49:08.000000000 +0100 @@ -17,7 +17,7 @@ # sync if needed [[ ! -e /usr/portage/profiles ]] && emerge-webrsync -# make world consistant +# make world consistent emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --complete-graph=y --update --newuse --deep @world # rebuild packages that might need it emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --usepkg=n @preserved-rebuild diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent new/diskimage-builder-2.20.3/diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent --- old/diskimage-builder-2.20.1/diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent 2019-02-28 07:49:08.000000000 +0100 @@ -6,7 +6,7 @@ set -eu set -o pipefail -install-packages -e git cloud-init +install-packages -e cloud-init rm -rf /tmp/ironic-python-agent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip --- old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip 2019-02-28 07:49:08.000000000 +0100 @@ -11,6 +11,8 @@ # Default packages _do_py3=0 _extra_repo='' + # see notes below on this var... + _clear_old_files=0 case "$DISTRO_NAME" in centos*|rhel7) # note python2-pip in epel @@ -23,6 +25,8 @@ else packages+=" python-setuptools" fi + # see notes below + _clear_old_files=1 ;; fedora) _do_py3=1 @@ -33,6 +37,7 @@ case "$DIB_RELEASE" in 42*) packages="python-virtualenv python-pip python-setuptools" + _clear_old_files=1 ;; tumbleweed|15*) # XXX: python3? @@ -68,15 +73,15 @@ # about to re-install so pip doesn't think anything is installed. # See: https://github.com/pypa/pip/issues/4805 # - # This is only necessary on CentOS -- for complicated reasons of - # course. On Fedora, the Python2 virtualenv packages are *not* - # distutils based and pip overwrites them correctly. For python3, - # pip has changed to not overwrite system packages (a long - # standing difference between Debuntu and Fedora), but a number of - # tools run with "python3 -Es" to isolate themselves to the - # package installed versions. So we definitely don't want to + # This is only necessary on old CentOS and suse -- for complicated + # reasons of course. On Fedora, the Python2 virtualenv packages + # are *not* distutils based and pip overwrites them correctly. + # For python3, pip has changed to not overwrite system packages (a + # long standing difference between Debuntu and Fedora), but a + # number of tools run with "python3 -Es" to isolate themselves to + # the package installed versions. So we definitely don't want to # clear the packaged versions out in that case. - if [[ $DISTRO_NAME =~ (centos|centos7|rhel7) ]]; then + if [[ ${_clear_old_files} == 1 ]]; then for pkg in $packages; do rpm -ql $pkg | xargs rm -rf done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/element-deps new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/element-deps --- old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/element-deps 2019-02-28 07:49:08.000000000 +0100 @@ -0,0 +1,3 @@ +openstack-ci-mirrors +opensuse-minimal + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/environment.d/10-source-installtype-pip-and-virtualenv new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/environment.d/10-source-installtype-pip-and-virtualenv --- old/diskimage-builder-2.20.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/environment.d/10-source-installtype-pip-and-virtualenv 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/environment.d/10-source-installtype-pip-and-virtualenv 2019-02-28 07:49:08.000000000 +0100 @@ -0,0 +1 @@ +export DIB_INSTALLTYPE_pip_and_virtualenv=source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration new/diskimage-builder-2.20.3/diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration --- old/diskimage-builder-2.20.1/diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration 2019-02-28 07:49:08.000000000 +0100 @@ -124,6 +124,9 @@ fi echo "Enabling repos: $repos" subscription-manager $repos + if [ -n "${REG_RELEASE:-}" ]; then + subscription-manager release --set=${REG_RELEASE} + fi ;; satellite) # Save an unmodified copy of the repo list for logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration new/diskimage-builder-2.20.3/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration --- old/diskimage-builder-2.20.1/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration 2019-02-14 03:13:02.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration 2019-02-28 07:49:08.000000000 +0100 @@ -102,6 +102,9 @@ subscription-manager repos --disable=\* echo "Enabling repos: $repos" subscription-manager $repos + if [ -n "${REG_RELEASE:-}" ]; then + subscription-manager release --set=${REG_RELEASE} + fi ;; satellite) # Save an unmodified copy of the repo list for logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder.egg-info/PKG-INFO new/diskimage-builder-2.20.3/diskimage_builder.egg-info/PKG-INFO --- old/diskimage-builder-2.20.1/diskimage_builder.egg-info/PKG-INFO 2019-02-14 03:14:32.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder.egg-info/PKG-INFO 2019-02-28 07:50:11.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.20.1 +Version: 2.20.3 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder.egg-info/SOURCES.txt new/diskimage-builder-2.20.3/diskimage_builder.egg-info/SOURCES.txt --- old/diskimage-builder-2.20.1/diskimage_builder.egg-info/SOURCES.txt 2019-02-14 03:14:32.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder.egg-info/SOURCES.txt 2019-02-28 07:50:11.000000000 +0100 @@ -529,6 +529,8 @@ diskimage_builder/elements/pip-and-virtualenv/post-install.d/89-clean-up-pip-cache diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/environment.d/10-source-installtype-pip-and-virtualenv +diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/element-deps +diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-opensuse/environment.d/10-source-installtype-pip-and-virtualenv diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/element-deps diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/environment.d/10-source-installtype-pip-and-virtualenv diskimage_builder/elements/pip-cache/README.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.20.1/diskimage_builder.egg-info/pbr.json new/diskimage-builder-2.20.3/diskimage_builder.egg-info/pbr.json --- old/diskimage-builder-2.20.1/diskimage_builder.egg-info/pbr.json 2019-02-14 03:14:32.000000000 +0100 +++ new/diskimage-builder-2.20.3/diskimage_builder.egg-info/pbr.json 2019-02-28 07:50:11.000000000 +0100 @@ -1 +1 @@ -{"git_version": "25ba034", "is_release": true} \ No newline at end of file +{"git_version": "0f8d340", "is_release": true} \ No newline at end of file
