Hello community,

here is the log from the commit of package python-azure-agent for 
openSUSE:Factory checked in at 2017-09-20 17:14:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-azure-agent (Old)
 and      /work/SRC/openSUSE:Factory/.python-azure-agent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-azure-agent"

Wed Sep 20 17:14:07 2017 rev:3 rq:527525 version:2.2.17

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-azure-agent/python-azure-agent.changes    
2017-08-10 14:12:54.197693996 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-azure-agent.new/python-azure-agent.changes   
    2017-09-20 17:14:10.908963234 +0200
@@ -1,0 +2,43 @@
+Wed Sep 20 12:12:53 UTC 2017 - [email protected]
+
+- Fix typo in dependency
+
+-------------------------------------------------------------------
+Sat Sep 16 11:00:53 UTC 2017 - [email protected]
+
+- Update to version 2.2.17 (bsc#1058974, bsc#1058975)
+  + Remove paa_noref_local_install.patch, included upstream
+  + Setup build for Python 3 for distros > SLE 12
+  + [#879] -- OS.EnableFirewall=y breaks load balanced sets probing
+- From 2.2.16
+  + [#865] -- The agent should retry ETIMEDOUT (110) IOErrors
+- From 2.2.15
+  + [#783] -- The agent fails to use the standard Linux environment variables
+    for HTTP proxy
+  + [#784] -- Adjust http retry and logging
+  + [#786] -- Add Provisioning.SshHostKeyPairType=auto to support ssh-keygen -A
+  + [#791] -- Prevent bloating sudoers waagent when agent has problem
+  + [#792] -- Clearlinux distro_name does not match
+  + [#796] -- Accommodate new Clear Linux distro string in os-release
+  + [#798] -- Support Ubuntu RDMA driver update
+  + [#800] -- HostGAPlugin still use proxy while auto-updating
+  + [#801] -- Agent fails to clean-up PID files
+  + [#807] -- The agent should not emit duplicate events
+  + [#808] -- The agent should more gracefully handle out-of-space disk
+    errors (IOError 28)
+  + [#811] -- Comments inline in /etc/waagent.conf cause config to not be read
+  + [#812] -- Agent fails and isn't recoverable if an extension's log
+    directory is not present anymore
+  + [#823] -- Show config options in use
+  + [#830] -- Ensure VM identifier is properly ordered
+  + [#845] -- ')' is missed in show-configuration
+  + [#850] -- Cannot get to state 'Running' with Provisioning.Enabled=n
+
+-------------------------------------------------------------------
+Fri Sep  8 18:33:06 UTC 2017 - [email protected]
+
+- Add paa_fix_driver_install_detect.patch (bsc#1057888)
+  + Avoid the driver from re-installing if the same version is already
+    installed, this avoids an enless reboot loop
+
+-------------------------------------------------------------------

Old:
----
  WALinuxAgent-2.2.14.tar.gz
  paa_noref_local_install.patch

New:
----
  WALinuxAgent-2.2.17.tar.gz
  paa_fix_driver_install_detect.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-azure-agent.spec ++++++
--- /var/tmp/diff_new_pack.rM1KIq/_old  2017-09-20 17:14:11.692852888 +0200
+++ /var/tmp/diff_new_pack.rM1KIq/_new  2017-09-20 17:14:11.696852325 +0200
@@ -20,30 +20,37 @@
 Summary:        Microsoft Azure Linux Agent
 License:        Apache-2.0
 Group:          System/Daemons
-Version:        2.2.14
+Version:        2.2.17
 Release:        0
 Url:            https://github.com/Azure/WALinuxAgent
 Source0:        WALinuxAgent-%{version}.tar.gz
 Patch1:         agent-no-auto-update.patch
-Patch2:         paa_noref_local_install.patch
+Patch3:         paa_fix_driver_install_detect.patch
 BuildRequires:  dos2unix
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-%if 0%{?suse_version}
-BuildRequires:  python-xml
-%endif
-BuildRequires:  udev
+
 %if 0%{?is_opensuse} || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320
 BuildRequires:  openSUSE-release
 %else
 BuildRequires:  sles-release
 %endif
-BuildRequires:  python-mock
+BuildRequires:  openssl
 %if 0%{?suse_version} < 1140
 BuildRequires:  python-ordereddict
 %endif
-BuildRequires:  openssl
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+BuildRequires:  python3-devel
+BuildRequires:  python3-mock
+BuildRequires:  python3-pytest
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-xml
+%else
+BuildRequires:  python-devel
+BuildRequires:  python-mock
 BuildRequires:  python-pytest
+BuildRequires:  python-setuptools
+BuildRequires:  python-xml
+%endif
+BuildRequires:  udev
 Requires:       eject
 Requires:       grep
 Requires:       iptables
@@ -58,8 +65,11 @@
 Requires:       openssh
 Requires:       openssl
 Requires:       pwdutils
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+Requires:       python3-pyasn1
+Requires:       python3-xml
+%else
 Requires:       python-pyasn1
-%if 0%{?suse_version}
 Requires:       python-xml
 %endif
 Requires:       sudo
@@ -89,12 +99,17 @@
 Summary:        Unit tests
 Group:          Development/Languages/Python
 Requires:       %{name} == %{version}
+Requires:       openssl
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+Requires:       python3-mock
+Requires:       python3-pytest
+%else
 Requires:       python-mock
+Requires:       python-pytest
+%endif
 %if 0%{?suse_version} < 1140
 Requires:       python-ordereddict
 %endif
-Requires:       openssl
-Requires:       python-pytest
 
 %description test
 Unit tests for python-azure-agent.
@@ -102,13 +117,21 @@
 %prep
 %setup -qn WALinuxAgent-%{version}
 %patch1
-%patch2
+%patch3
 
 %build
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+python3 setup.py build
+%else
 python setup.py build
+%endif
 
 %install
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+python3 setup.py install --prefix=%{_prefix} --lnx-distro='suse' 
--root=%{buildroot}
+%else
 python setup.py install --prefix=%{_prefix} --lnx-distro='suse' 
--root=%{buildroot}
+%endif
 %if 0%{?suse_version} > 1140
 ln -s service %{buildroot}%{_sbindir}/rcwaagent
 %if 0%{?suse_version} < 1230
@@ -137,7 +160,11 @@
 mv %{buildroot}/%{_sysconfdir}/logrotate.d/waagent.logrotate 
%{buildroot}/%{_sysconfdir}/logrotate.d/waagent
 
 # install tests
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+cp -r tests %{buildroot}/%{python3_sitelib}/azurelinuxagent
+%else
 cp -r tests %{buildroot}/%{python_sitelib}/azurelinuxagent
+%endif
 
 %pre
 %if 0%{?suse_version} > 1140
@@ -185,12 +212,22 @@
 /usr//lib/udev/rules.d/66-azure-storage.rules
 /usr/lib/udev/rules.d/99-azure-product-uuid.rules
 %endif
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+%dir %{python3_sitelib}/azurelinuxagent
+%{python3_sitelib}
+%exclude %{python3_sitelib}/azurelinuxagent/tests
+%else
 %dir %{python_sitelib}/azurelinuxagent
 %{python_sitelib}
 %exclude %{python_sitelib}/azurelinuxagent/tests
+%endif
 
 %files test
 %defattr(0644,root,root,0755)
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+%{python3_sitelib}/azurelinuxagent/tests
+%else
 %{python_sitelib}/azurelinuxagent/tests
+%endif
 
 %changelog

++++++ WALinuxAgent-2.2.14.tar.gz -> WALinuxAgent-2.2.17.tar.gz ++++++
++++ 5898 lines of diff (skipped)

++++++ paa_fix_driver_install_detect.patch ++++++
--- azurelinuxagent/pa/rdma/suse.py.orig
+++ azurelinuxagent/pa/rdma/suse.py
@@ -18,7 +18,6 @@
 #
 
 import glob
-import os
 import azurelinuxagent.common.logger as logger
 import azurelinuxagent.common.utils.shellutil as shellutil
 from azurelinuxagent.common.rdma import RDMAHandler
@@ -37,8 +36,10 @@ class SUSERDMAHandler(RDMAHandler):
             return
         zypper_install = 'zypper -n in %s'
         zypper_install_noref = 'zypper -n --no-refresh in %s'
+        zypper_lock = 'zypper addlock %s'
         zypper_remove = 'zypper -n rm %s'
         zypper_search = 'zypper -n se -s %s'
+        zypper_unlock = 'zypper removelock %s'
         package_name = 'msft-rdma-kmp-default'
         cmd = zypper_search % package_name
         status, repo_package_info = shellutil.run_get_output(cmd)
@@ -54,13 +55,23 @@ class SUSERDMAHandler(RDMAHandler):
                 installed = sections[0].strip()
                 version = sections[3].strip()
                 driver_package_versions.append(version)
-                if fw_version in version and installed == 'i':
+                if (
+                        fw_version in version
+                        and len(installed) >= 1
+                        and installed[0] == 'i'
+                ):
                     info_msg = 'RDMA: Matching driver package "%s-%s" '
                     info_msg += 'is already installed, nothing to do.'
                     logger.info(info_msg % (package_name, version))
                     return True
-                if installed == 'i':
+                if len(installed) >= 1 and installed[0] == 'i':
+                    # A driver with a different version is installed
                     driver_package_installed = True
+                    cmd = zypper_unlock % package_name
+                    result = shellutil.run(cmd)
+                    info_msg = 'Driver with different version installed '
+                    info_msg += 'unlocked package "%s".'
+                    logger.info(info_msg % (package_name))
 
         # If we get here the driver package is installed but the
         # version doesn't match or no package is installed
@@ -80,7 +91,7 @@ class SUSERDMAHandler(RDMAHandler):
 
         logger.info("RDMA: looking for fw version %s in packages" % fw_version)
         for entry in driver_package_versions:
-            if not fw_version in version:
+            if fw_version not in entry:
                 logger.info("Package '%s' is not a match." % entry)
             else:
                 logger.info("Package '%s' is a match. Installing." % entry)
@@ -94,6 +105,11 @@ class SUSERDMAHandler(RDMAHandler):
                 msg = 'RDMA: Successfully installed "%s" from '
                 msg += 'configured repositories'
                 logger.info(msg % complete_name)
+                # Lock the package so it does not accidentally get updated
+                cmd = zypper_lock % package_name
+                result = shellutil.run(cmd)
+                info_msg = 'Applied lock to "%s"' % package_name
+                logger.info(info_msg)
                 if not self.load_driver_module() or requires_reboot:
                     self.reboot_system()
                 return True
@@ -119,6 +135,11 @@ class SUSERDMAHandler(RDMAHandler):
                     msg = 'RDMA: Successfully installed "%s" from '
                     msg += 'local package cache'
                     logger.info(msg % (local_package))
+                    # Lock the package so it does not accidentally get updated
+                    cmd = zypper_lock % package_name
+                    result = shellutil.run(cmd)
+                    info_msg = 'Applied lock to "%s"' % package_name
+                    logger.info(info_msg)
                     if not self.load_driver_module() or requires_reboot:
                         self.reboot_system()
                     return True

Reply via email to