[Fixed] Issue 9: proto_path has no effect

chrisk · Dec 27, 2008 · d9eec52 · d9eec52
1 parent 383ea2e
commit d9eec52
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/protobuf/compiler/visitors.rb b/lib/protobuf/compiler/visitors.rb
@@ -48,7 +48,16 @@ def attach_proto?
       end
 
       def commented_proto_contents
-        File.read(proto_file).gsub(/^/, '# ') if proto_file
+        #File.read(proto_file).gsub(/^/, '# ') if proto_file
+        if proto_file
+          if File.exist? proto_file
+            File.read(proto_file).gsub(/^/, '# ')
+          elsif File.exist? "#{@proto_dir}/#{proto_file}"
+            File.read("#{@proto_dir}/#{proto_file}").gsub(/^/, '# ')
+          else
+            raise Errno::ENOENT.new(proto_file)
+          end
+        end
       end
 
       def write(str)