diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2008-02-13 15:08:50 -0600 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2008-02-13 15:08:50 -0600 |
| commit | fc7553243d86174302a4244f7140dda2267d655a (patch) | |
| tree | e6b8306217bf8ae81a275c8418eb1bf4e6a02918 | |
| parent | c7debfcd9b356206b855a7ee9eb3bd55a9786559 (diff) | |
| parent | 1819aa2974e8752e8e82b606d3ea57b9a2afd268 (diff) | |
| download | mock-fc7553243d86174302a4244f7140dda2267d655a.tar.gz mock-fc7553243d86174302a4244f7140dda2267d655a.tar.xz mock-fc7553243d86174302a4244f7140dda2267d655a.zip | |
Merge branch 'master' of /var/ftp/pub/Applications/git/mock
* 'master' of /var/ftp/pub/Applications/git/mock:
version bump
add fcntl import
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | py/mock/util.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1717804..c17471c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,12 +4,12 @@ #################################### # change version here. --> BOTH PLACES PLEASE! -AC_INIT([mock],[0.9.6]) +AC_INIT([mock],[0.9.7]) temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=9 -temp_RELEASE_SUBLEVEL=6 +temp_RELEASE_SUBLEVEL=7 temp_RELEASE_EXTRALEVEL= #################################### diff --git a/py/mock/util.py b/py/mock/util.py index a0a6b65..8721110 100644 --- a/py/mock/util.py +++ b/py/mock/util.py @@ -7,6 +7,7 @@ # python library imports import ctypes +import fcntl import os import os.path import popen2 |