correctly handle newline and missing file

e9e8b1d5 · Marco Mariani · 67a0f7f4 · e9e8b1d5
Commit e9e8b1d5 authored Feb 01, 2013 by Marco Mariani
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

slapos/recipe/librecipe/generic.py slapos/recipe/librecipe/generic.py +3 -3

No files found.
--- a/slapos/recipe/librecipe/generic.py
+++ b/slapos/recipe/librecipe/generic.py
@@ -98,9 +98,9 @@ class GenericBaseRecipe(object):
    line must be unicode."""
-    try:
+    if os.path.exists(filepath):
-      lines = io.open(filepath, 'r', encoding=encoding).readlines()
+      lines = [l.rstrip('\n') for l in io.open(filepath, 'r', encoding=encoding)]
-    except IOError:
+    else:
      lines = []
    if not line in lines: