Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

This commit is contained in:
Aditi Mittal
2013-09-09 21:53:56 +05:30
3 changed files with 13 additions and 4 deletions

View File

@@ -60,7 +60,7 @@ class CommonAsciiProcessor(MediaProcessor):
# Conversions subdirectory to avoid collisions
self.conversions_subdir = os.path.join(
self.workbench.dir, 'convirsions')
self.workbench.dir, 'conversions')
os.mkdir(self.conversions_subdir)
# Pull down and set up the processing file

View File

@@ -144,7 +144,7 @@ class CommonImageProcessor(MediaProcessor):
## @@: Should this be two functions?
# Conversions subdirectory to avoid collisions
self.conversions_subdir = os.path.join(
self.workbench.dir, 'convirsions')
self.workbench.dir, 'conversions')
os.mkdir(self.conversions_subdir)
# Pull down and set up the processing file