Fixed Makefile target: release

2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index b44336a..57faf69 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,9 @@ ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
 
 release: test_all
 	python setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions
-	git -a -m "Release of $(VERSION)" $(VERSION) # Fail on existing tags
+	git tag -a -m "Release of $(VERSION)" $(VERSION) # Fail on existing tags
 	python setup.py sdist register upload # Release to pypi
+	echo "Do not forget to: git push --tags"
 
 install:
 	python setup.py install
diff --git a/bottle.py b/bottle.py
index 590aace..1a6b621 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2651,7 +2651,7 @@ class SimpleTemplate(BaseTemplate):
         ptrbuffer = [] # Buffer for printable strings and token tuple instances
         codebuffer = [] # Buffer for generated python code
         multiline = dedent = oneline = False
-        template = self.source if self.source else open(self.filename, 'rb').read()
+        template = self.source or open(self.filename, 'rb').read()
 
         def yield_tokens(line):
             for i, part in enumerate(re.split(r'\{\{(.*?)\}\}', line)):