Derive the changelog_path variable from the new checkdir_relative variable.

svn path=/main/trunk/; revision=11854

diff --git a/bin/repoman b/bin/repoman
index f9900781a6173b939c9af9f13d756ae69b71004a..22568ab38570e5b7a8af5eda43f7f9d1fe662390 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1066,12 +1066,7 @@ for x in scanlist:
 
                del metadata_bad
 
-       changelog_path = "ChangeLog"
-       if repolevel < 3:
-               changelog_path = os.path.join(pkgdir, changelog_path)
-       if repolevel < 2:
-               changelog_path = os.path.join(catdir, changelog_path)
-       changelog_path = os.path.join(".", changelog_path)
+       changelog_path = os.path.join(checkdir_relative, "ChangeLog")
        changelog_modified = changelog_path in modified_changelogs
 
        allmasked = True