Mercurial > squish / changeset

• changeset
• raw
• zip
• gz

changeset

Don't let squishy file override the user's specified output file, if one

Mon, 25 Jan 2010 19:00:43 +0000

author

Matthew Wild <mwild1@gmail.com>

date

Mon, 25 Jan 2010 19:00:43 +0000

changeset 55

feb7832393cd

parent 54

90bf9ea1aaf0

child 56

791c9d8b750c

Don't let squishy file override the user's specified output file, if one

--- a/squish.lua	Tue Nov 17 14:13:38 2009 +0000
+++ b/squish.lua	Mon Jan 25 19:00:43 2010 +0000
@@ -65,7 +65,9 @@
 end
 
 function Output(fn)
-	out_fn = fn;
+	if opts.output == nil then
+		out_fn = fn;
+	end
 end
 
 function Option(name)