From: Zack Cerza Date: Tue, 16 Jun 2015 15:25:26 +0000 (-0600) Subject: need_to_install_distro(): return newest version X-Git-Tag: 1.1.0~914^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eacb7da87bba78f8134e9a9768631ed6b7ecf19a;p=teuthology.git need_to_install_distro(): return newest version Signed-off-by: Zack Cerza --- diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py index 710ae971c..0c4054c38 100644 --- a/teuthology/task/kernel.py +++ b/teuthology/task/kernel.py @@ -617,8 +617,10 @@ def need_to_install_distro(remote): """ Installing kernels on rpm won't setup grub/boot into them. This installs the newest kernel package and checks its version and compares against - current (uname -r) and returns true if newest != current. Similar check - for deb. + the running kernel (uname -r). Similar check for deb. + + :returns: False if running the newest distro kernel. Returns the version of + the newest if it is not running. """ package_type = remote.os.package_type output, err_mess = StringIO(), StringIO() @@ -670,7 +672,7 @@ def need_to_install_distro(remote): log.info( 'Not newest distro kernel. Curent: {cur} Expected: {new}'.format( cur=current, new=newest)) - return True + return newest def maybe_generate_initrd_rpm(remote, path, version):