Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the documentation plug-ins, when the user left the output directory/file empty.
Sat, 25 Oct 2014 10:47:13 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 25 Oct 2014 10:47:13 +0200
- branch
- 5_5_x
- changeset 3880
- e7f6e47bc16f
- parent 3878
- 935dc093d750
- child 3881
- 788a2185eabb
Fixed an issue in the documentation plug-ins, when the user left the output directory/file empty.
(grafted from b9b50c28df5fb431fe90275d6b8708069669ea76)
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Wed Oct 22 19:02:17 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Oct 25 10:47:13 2014 +0200 @@ -142,6 +142,8 @@ else: args.append( os.path.join(self.ppath, self.parameters['outputFile'])) + else: + self.parameters['outputFile'] = self.defaults['outputFile'] if self.parameters['basePackage'] != self.defaults['basePackage']: parms['basePackage'] = self.parameters['basePackage'] args.append('-b')
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Wed Oct 22 19:02:17 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Oct 25 10:47:13 2014 +0200 @@ -189,6 +189,9 @@ else: args.append(os.path.join( self.ppath, self.parameters['outputDirectory'])) + else: + self.parameters['outputDirectory'] = \ + self.defaults['outputDirectory'] if self.parameters['ignoreDirectories'] != \ self.defaults['ignoreDirectories']: parms['ignoreDirectories'] = \
