Some more fixes

dennis/tasks/prepare.py

@@ -97,29 +97,31 @@ def run(self):
         self._checkout(release_branch_name)
 
         # Bump the version etc.
-        if not self.release and self.has_release_script:
-            _log.info('Running {} script inside {}'.format(
-                self.release_script_name, self.repo_name
-            ))
-            output, success, return_code = run_command(
-                [
-                    self.release_script_path,
-                    self.last_version,
-                    new_version
-                ],
-                cwd=self.repo.working_dir
-            )
-            if not success:
-                raise DennisException(
-                    'Failed to run release script {} with code {}'
-                    ' and output {}'.format(
-                        self.release_script_path, return_code, output
-                    )
+        if not self.release:
+            if self.has_release_script:
+                _log.info('Running {} script inside {}'.format(
+                    self.release_script_name, self.repo_name
+                ))
+                output, success, return_code = run_command(
+                    [
+                        self.release_script_path,
+                        self.last_version,
+                        new_version
+                    ],
+                    cwd=self.repo.working_dir
                 )
-        else:
-            _log.warn(
-                'No release script ({}) was found in the project root'.format(
-                    self.release_script_name))
+                if not success:
+                    raise DennisException(
+                        'Failed to run release script {} with code {}'
+                        ' and output {}'.format(
+                            self.release_script_path, return_code, output
+                        )
+                    )
+            else:
+                _log.warn(
+                    'No release script ({}) was found'
+                    ' in the project root'.format(
+                        self.release_script_name))
 
         if not self.release:
             # Generate the changelog

dennis/tasks/task.py

@@ -169,26 +169,27 @@ def _get_release_artifacts(self, version):
 
         _log.info(
             'Gathering release artifacts'
-            ' in project {} for version {}...'.format(
+            ' in project {} for version {}:'.format(
                 self.repo_name, release.version)
         )
 
+        _log.info('\t- release branch...')
         release.branch = self._get_branch(release.name)
 
         if not release.branch:
             return None
 
-        _log.info('Found release branch. Searching for matching PR...')
+        _log.info('\t- release PR...')
         release.pr = self._get_open_pr(
             format_release_pr_name(release.version)
         )
 
-        _log.info('Searching for matching GitHub release...')
+        _log.info('\t- GitHub release...')
         release.github_release = self._get_github_release(
             release.version
         )
 
-        _log.info('Checking if release has been merged back...')
+        _log.info('\t- is release merged back into develop...')
         last_commit = release.branch.commit.hexsha
         release.merged_back = self._branch_contains_commit(
             'develop', last_commit
@@ -284,8 +285,6 @@ def _commit_all(self, message):
         )
 
     def _branch_contains_commit(self, branch, commit):
-        import pdb
-        pdb.set_trace()
         output = git.Git(self.repo.working_dir).execute(
             ['git', 'branch', '--contains', commit]
         )