Commits

Konstantine Rybnikov committed f5ba177

minor fix

Comments (0)

Files changed (1)

         
         ret_val = []
         for filename in self.merge_groups[group_name].files:
-            with codecs.open(os.path.join(self.base_path, filename), 'r', 'utf-8') as f:
+            with codecs.open(
+                os.path.join(self.base_path,
+                             os.path.join(self.merge_groups[group_name].prefix,
+                                          filename)), 'r', 'utf-8') as f:
                 ret_val += f.readlines()
         return ret_val
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.