summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Git.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-12-09 11:10:24 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-18 08:24:24 -0600
commit89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (patch)
treeed4623b5c6e39d80c132e9f21f3d4804cabd93be /src/lib/Bcfg2/Server/Plugins/Git.py
parent64b458b380620f84843b1841b441745a0984946f (diff)
downloadbcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.gz
bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.bz2
bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.zip
Remove blanket excepts from plugins and lint
This removes most blanket except: clauses from all plugins, including the base plugin libraries, and bcfg2-lint. The few that remain should all be necessary. Most of the changes were quite minor, but this did require some restructuring of the CfgPrivateKeyCreator; as a result, the tests for that module were rewritten.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Git.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Git.py27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Git.py b/src/lib/Bcfg2/Server/Plugins/Git.py
index 9012fceb0..d0ae010fa 100644
--- a/src/lib/Bcfg2/Server/Plugins/Git.py
+++ b/src/lib/Bcfg2/Server/Plugins/Git.py
@@ -41,22 +41,17 @@ class Git(Version):
def get_revision(self):
"""Read git revision information for the Bcfg2 repository."""
- try:
- if HAS_GITPYTHON:
- return self.repo.head.commit.hexsha
- else:
- cmd = ["git", "--git-dir", self.vcs_path,
- "--work-tree", Bcfg2.Options.setup.vcs_root,
- "rev-parse", "HEAD"]
- self.debug_log("Git: Running %s" % cmd)
- result = self.cmd.run(cmd)
- if not result.success:
- raise Exception(result.stderr)
- return result.stdout
- except:
- raise PluginExecutionError("Git: Error getting revision from %s: "
- "%s" % (Bcfg2.Options.setup.vcs_root,
- sys.exc_info()[1]))
+ if HAS_GITPYTHON:
+ return self.repo.head.commit.hexsha
+ else:
+ cmd = ["git", "--git-dir", self.vcs_path,
+ "--work-tree", Bcfg2.Options.setup.vcs_root,
+ "rev-parse", "HEAD"]
+ self.debug_log("Git: Running %s" % cmd)
+ result = self.cmd.run(cmd)
+ if not result.success:
+ raise PluginExecutionError(result.stderr)
+ return result.stdout
def Update(self, ref=None):
""" Git.Update() => True|False