[SCM] morituri/master: hack to get proper revision before generating configure/*py
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:10:11 UTC 2014
The following commit has been merged in the master branch:
commit 1a047a2ebe2fb01d733f30577ac12173efb164aa
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Sat Aug 24 01:51:44 2013 +0200
hack to get proper revision before generating configure/*py
diff --git a/morituri/configure/configure.py b/morituri/configure/configure.py
index 6a38329..3d626f4 100644
--- a/morituri/configure/configure.py
+++ b/morituri/configure/configure.py
@@ -25,9 +25,15 @@ __thisdir = os.path.dirname(os.path.abspath(__file__))
if os.path.exists(os.path.join(__thisdir, 'uninstalled.py')):
from morituri.configure import uninstalled
config_dict = uninstalled.get()
-else:
+elif os.path.exists(os.path.join(__thisdir, 'installed.py')):
from morituri.configure import installed
config_dict = installed.get()
+else:
+ # hack on fresh checkout, no make run yet, and configure needs revision
+ from morituri.common import common
+ config_dict = {
+ 'revision': common.getRevision(),
+ }
for key, value in config_dict.items():
dictionary = locals()
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list