From 7ecf99ee19836c19d155d46d23f744cfb6583397 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Thu, 13 Sep 2012 15:41:50 +0200 Subject: [PATCH] dont rely on network --- debian/docs | 1 - debian/patches/dont-rely-on-network | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 12 ++++++++++-- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 debian/patches/dont-rely-on-network diff --git a/debian/docs b/debian/docs index 1786752..a1320b1 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1 @@ README.rst -ChangeLog diff --git a/debian/patches/dont-rely-on-network b/debian/patches/dont-rely-on-network new file mode 100644 index 0000000..030e926 --- /dev/null +++ b/debian/patches/dont-rely-on-network @@ -0,0 +1,29 @@ +Description: package shoud not depends on network +Author: Mehdi Abaakouk + +--- python-cinderclient-0.2.orig/cinderclient/openstack/common/setup.py ++++ python-cinderclient-0.2/cinderclient/openstack/common/setup.py +@@ -226,8 +226,8 @@ def get_cmdclass(): + """Builds the ChangeLog and Authors files from VC first.""" + + def run(self): +- write_git_changelog() +- generate_authors() ++ #write_git_changelog() ++ #generate_authors() + # sdist.sdist is an old style class, can't use super() + sdist.sdist.run(self) + +@@ -323,8 +323,8 @@ def get_post_version(projectname): + revision if there is one, or tag plus number of additional revisions + if the current revision has no tag.""" + +- if os.path.isdir('.git'): +- version = _get_git_post_version() +- write_versioninfo(projectname, version) +- return version ++# if os.path.isdir('.git'): ++# version = _get_git_post_version() ++# write_versioninfo(projectname, version) ++# return version + return open(os.path.join(projectname, 'versioninfo'), 'r').read().strip() diff --git a/debian/patches/series b/debian/patches/series index ed0fe35..dfad0be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-pep8-errors.patch +dont-rely-on-network diff --git a/debian/rules b/debian/rules index e2e0b21..73a7df2 100755 --- a/debian/rules +++ b/debian/rules @@ -4,13 +4,21 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -%: - dh $@ --with python2 +DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') override_dh_auto_clean: + echo $(VERSION) > cinderclient/versioninfo dh_auto_clean rm -f cinderclient/versioninfo +override_dh_auto_configure: + echo $(VERSION) > cinderclient/versioninfo + dh_auto_configure + +%: + dh $@ --with python2 + get-orig-source: uscan --verbose --force-download --rename --destdir=../build-area