From a5767685db4d864cc356b302886b4113d9daf167 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sun, 16 Aug 2009 19:57:11 +0000 Subject: Client tools: Remove unnecessary extra whitespace Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5408 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/YUMng.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/lib/Client/Tools/YUMng.py') diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index e81b4ee7d..b30d6cdcc 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -52,11 +52,11 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): name = 'YUMng' __execs__ = ['/usr/bin/yum', '/var/lib/rpm'] __handles__ = [('Package', 'yum'), ('Package', 'rpm')] - + __req__ = {'Package': ['name', 'version']} __ireq__ = {'Package': ['name']} #__ireq__ = {'Package': ['name', 'version']} - + __new_req__ = {'Package': ['name'], 'Instance': ['version', 'release', 'arch']} __new_ireq__ = {'Package': ['name'], \ 'Instance': []} @@ -121,13 +121,13 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): release=rel, epoch=epoch) return Bcfg2.Client.Tools.RPMng.RPMng.VerifyPackage(self, entry, modlist) - + def Install(self, packages, states): ''' Try and fix everything that RPMng.VerifyPackages() found wrong for each Package Entry. This can result in individual RPMs being installed (for the first time), deleted, downgraded - or upgraded. + or upgraded. NOTE: YUM can not reinstall a package that it thinks is already installed. @@ -183,8 +183,8 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): install_pkgs.append(pkg) # Install GPG keys. - # Alternatively specify the required keys using 'gpgkey' in the - # repository definition in yum.conf. YUM will install the keys + # Alternatively specify the required keys using 'gpgkey' in the + # repository definition in yum.conf. YUM will install the keys # automatically. if len(gpg_keys) > 0: for inst in gpg_keys: @@ -221,7 +221,7 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): for inst in install_pkgs: pkg_arg = self.instance_status[inst].get('pkg').get('name') install_args.append(build_yname(pkg_arg, inst)) - + cmdrc, output = self.cmd.run(pkgtool % " ".join(install_args)) if cmdrc == 0: # The yum command succeeded. All packages installed. @@ -257,7 +257,7 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): for inst in upgrade_pkgs: pkg_arg = build_yname(self.instance_status[inst].get('pkg').get('name'), inst) upgrade_args.append(pkg_arg) - + cmdrc, output = self.cmd.run(pkgtool % " ".join(upgrade_args)) if cmdrc == 0: # The yum command succeeded. All packages installed. -- cgit v1.2.3-1-g7c22