diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2017-09-30 19:35:09 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2017-09-30 19:40:00 +0200 |
| commit | 3d019e5138958d367be6ad47587adc7c3efb01c7 (patch) | |
| tree | c2105fae0a4b7dacceea55c7bfd298ec6321d57b | |
| parent | 7b0c5af6c3b5bdc66fc425049673aa04f6067262 (diff) | |
[grc] better path handling in generator (merges #1473)
| -rw-r--r-- | grc/core/generator/top_block.py | 10 | ||||
| -rw-r--r-- | grc/gui/Notebook.py | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/grc/core/generator/top_block.py b/grc/core/generator/top_block.py index 1105b81963..799ebb1076 100644 --- a/grc/core/generator/top_block.py +++ b/grc/core/generator/top_block.py @@ -4,7 +4,6 @@ import os import tempfile import textwrap import time -import re from mako.template import Template @@ -33,14 +32,13 @@ class TopBlockGenerator(object): self._generate_options = self._flow_graph.get_option('generate_options') self._mode = TOP_BLOCK_FILE_MODE - dirname = os.path.dirname(file_path) # Handle the case where the directory is read-only # In this case, use the system's temp directory - if not os.access(dirname, os.W_OK): - dirname = tempfile.gettempdir() + if not os.access(file_path, os.W_OK): + file_path = tempfile.gettempdir() filename = self._flow_graph.get_option('id') + '.py' - self.file_path = os.path.join(dirname, filename) - self._dirname = dirname + self.file_path = os.path.join(file_path, filename) + self._dirname = file_path def _warnings(self): throttling_blocks = [b for b in self._flow_graph.get_enabled_blocks() diff --git a/grc/gui/Notebook.py b/grc/gui/Notebook.py index 21db913c0e..9f63190b31 100644 --- a/grc/gui/Notebook.py +++ b/grc/gui/Notebook.py @@ -151,7 +151,7 @@ class Page(Gtk.HBox): generator """ platform = self.flow_graph.parent_platform - return platform.Generator(self.flow_graph, self.file_path) + return platform.Generator(self.flow_graph, os.path.dirname(self.file_path)) def _handle_button(self, button): """ |