From 64ae9e19f4ea4a3362a91f4707032ab2a9f87479 Mon Sep 17 00:00:00 2001
From: Christian Boos <cboos@edgewall.org>
Date: Sun, 17 Feb 2013 12:52:36 +0100
Subject: [PATCH] Use libgit2 LIBGIT2_VER* constants directly instead of
git_libgit2_version() call.
---
pygit2/__init__.py | 3 +--
src/pygit2.c | 10 ++++------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/pygit2/__init__.py b/pygit2/__init__.py
index 601bd21..b48f15d 100644
--- a/pygit2/__init__.py
+++ b/pygit2/__init__.py
@@ -29,5 +29,4 @@ from .version import __version__
from _pygit2 import *
import pygit2.utils
-__libgit2_version__ = '%d.%d.%s' % (
- LIBGIT2_VERSION_MAJOR, LIBGIT2_VERSION_MINOR, LIBGIT2_VERSION_REV)
+__libgit2_version__ = LIBGIT2_VERSION
diff --git a/src/pygit2.c b/src/pygit2.c
index e46e67f..3ee2ff5 100644
--- a/src/pygit2.c
+++ b/src/pygit2.c
@@ -179,8 +179,6 @@ PyMethodDef module_methods[] = {
PyObject*
moduleinit(PyObject* m)
{
- int libgit2_major, libgit2_minor, libgit2_rev;
-
if (m == NULL)
return NULL;
@@ -404,10 +402,10 @@ moduleinit(PyObject* m)
PyModule_AddIntConstant(m, "GIT_FILEMODE_COMMIT", GIT_FILEMODE_COMMIT);
/* libgit2 version info */
- git_libgit2_version(&libgit2_major, &libgit2_minor, &libgit2_rev);
- PyModule_AddIntConstant(m, "LIBGIT2_VERSION_MAJOR", libgit2_major);
- PyModule_AddIntConstant(m, "LIBGIT2_VERSION_MINOR", libgit2_minor);
- PyModule_AddIntConstant(m, "LIBGIT2_VERSION_REV", libgit2_rev);
+ PyModule_AddIntConstant(m, "LIBGIT2_VER_MAJOR", LIBGIT2_VER_MAJOR);
+ PyModule_AddIntConstant(m, "LIBGIT2_VER_MINOR", LIBGIT2_VER_MINOR);
+ PyModule_AddIntConstant(m, "LIBGIT2_VER_REVISION", LIBGIT2_VER_REVISION);
+ PyModule_AddStringConstant(m, "LIBGIT2_VERSION", LIBGIT2_VERSION);
return m;
}