diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-14 19:54:39 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-14 19:54:39 -0700 |
| commit | cc1c0813859d7860e3f4a497e41ee51bb86111f8 (patch) | |
| tree | 3ae4912e87f0688958e75820d149ce38d60ed76e | |
| parent | 4983b670cdb44d860b9a46325f5ae28cd9685586 (diff) | |
| download | portage-cc1c0813859d7860e3f4a497e41ee51bb86111f8.tar.gz portage-cc1c0813859d7860e3f4a497e41ee51bb86111f8.tar.bz2 portage-cc1c0813859d7860e3f4a497e41ee51bb86111f8.zip | |
repoman --echangelog: fix manifest-only commmits
| -rwxr-xr-x | bin/repoman | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman index ffc622c2f..2b4cd28e6 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2451,7 +2451,7 @@ else: checkdir_modified = False checkdir_pattern = checkdir_relative.rstrip(os.sep) + os.sep - for f in chain(myupdates, myremoved): + for f in chain(myupdates, mymanifests, myremoved): if f.startswith(checkdir_pattern): checkdir_modified = True break @@ -2460,7 +2460,9 @@ else: myupdates.append(changelog_path) logging.info("calling echangelog for package %s" % x) - echangelog_args = ["echangelog", "--vcs", vcs, changelog_msg] + # --no-strict is required if only manifest(s) have changed + echangelog_args = ["echangelog", "--no-strict", + "--vcs", vcs, changelog_msg] if options.pretend: writemsg_stdout("(%s)\n" % (" ".join(echangelog_args),), noiselevel=-1) |