Merge pull request #6307 from s0undt3ch/hotfix/pylint-anomalous-backs…

…lash Strings containing backslashes should either be escaped or raw strings.
saltstack · Jul 26, 2013 · 5de7cd5 · 5de7cd5
2 parents 99dfe0c + b235d11
commit 5de7cd5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
@@ -181,18 +181,18 @@ def _set_repo_options(yumbase, **kwargs):
 
     try:
         if fromrepo:
-            log.info('Restricting to repo \'{0}\''.format(fromrepo))
+            log.info('Restricting to repo {0!r}'.format(fromrepo))
             yumbase.repos.disableRepo('*')
             yumbase.repos.enableRepo(fromrepo)
         else:
             if disablerepo:
-                log.info('Disabling repo \'{0}\''.format(disablerepo))
+                log.info('Disabling repo {0!r}'.format(disablerepo))
                 yumbase.repos.disableRepo(disablerepo)
             if enablerepo:
-                log.info('Enabling repo \'{0}\''.format(enablerepo))
+                log.info('Enabling repo {0!r}'.format(enablerepo))
                 yumbase.repos.enableRepo(enablerepo)
-    except yum.Errors.RepoError as e:
-        return e
+    except yum.Errors.RepoError as exc:
+        return exc
 
 
 def latest_version(*names, **kwargs):