Skip to content

Commit

Permalink
package generation error relating to gitignore feature
Browse files Browse the repository at this point in the history
  • Loading branch information
jhpyle committed Jul 13, 2024
1 parent b11ca59 commit 07d3943
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## [1.4.109] - 2024-07-12

### Fixed
- Bug related to Playground package generation, introduced in 1.4.108.

## [1.4.108] - 2024-07-10

### Changed
Expand Down
6 changes: 3 additions & 3 deletions docassemble_webapp/docassemble/webapp/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,13 +631,13 @@ def make_package_dir(pkgname, info, author_info, directory=None, current_project
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
using_default = {}
if info['gitignore'] and re.search(r'[A-Za-z]', info['gitignore']):
using_default = {'gitignore': False, 'readme': False}
if info.get('gitignore') and re.search(r'[A-Za-z]', info['gitignore']):
gitignore = str(info['gitignore'])
else:
gitignore = daconfig.get('default gitignore', DEFAULT_GITIGNORE)
using_default['gitignore'] = True
if info['readme'] and re.search(r'[A-Za-z]', info['readme']):
if info.get('readme') and re.search(r'[A-Za-z]', info['readme']):
readme = str(info['readme'])
else:
readme = '# docassemble.' + str(pkgname) + "\n\n" + info['description'] + "\n\n## Author\n\n" + author_info['author name and email'] + "\n\n"
Expand Down

0 comments on commit 07d3943

Please sign in to comment.