[packages/bakefile.git] / bakefile-empy.patch

--- bakefile-0.1.1.20031019/src/writer.py.wiget	2003-10-13 23:53:41.000000000 +0200
+++ bakefile-0.1.1.20031019/src/writer.py	2003-10-19 14:20:04.000000000 +0200
@@ -174,7 +174,10 @@
     return (rulesdir, template)
 
 def invoke_em(writer, file, method):
-    import empy.em
+    try:
+        import em
+    except ImportError:
+      from empy import em
     rulesdir, template = __findWriter(writer)
     
     filename = tempfile.mktemp('bakefile')
@@ -182,7 +185,7 @@
     # creating the file:
     tmpf = open(filename, 'wb'); tmpf.close()
     
-    empy.em.invoke(['-I','mk',
+    em.invoke(['-I','mk',
                     '-I','writer',
                     '-I','utils',
                     '-I','os,os.path',
Commit	Line	Data
331059cb AF	1	--- bakefile-0.1.1.20031019/src/writer.py.wiget 2003-10-13 23:53:41.000000000 +0200
	2	+++ bakefile-0.1.1.20031019/src/writer.py 2003-10-19 14:20:04.000000000 +0200
	3	@@ -174,7 +174,10 @@
a02160c3 AF	4	return (rulesdir, template)
	5
	6	def invoke_em(writer, file, method):
	7	- import empy.em
6e7cce1b	8	+ try:
331059cb	9	+ import em
6e7cce1b	10	+ except ImportError:
331059cb	11	+ from empy import em
a02160c3	12	rulesdir, template = __findWriter(writer)
331059cb AF	13
	14	filename = tempfile.mktemp('bakefile')
	15	@@ -182,7 +185,7 @@
	16	# creating the file:
	17	tmpf = open(filename, 'wb'); tmpf.close()
	18
a02160c3 AF	19	- empy.em.invoke(['-I','mk',
	20	+ em.invoke(['-I','mk',
	21	'-I','writer',
	22	'-I','utils',
	23	'-I','os,os.path',