Merge pull request #634 from jberry-suse/origin-changed

leaper.py: indicate if origin differs from the expected origin.
This commit is contained in:
Ludwig Nussel 2017-01-12 09:50:57 +01:00 committed by GitHub
commit d72ef36cfc

View File

@ -135,7 +135,9 @@ class Leaper(ReviewBot.ReviewBot):
is_fine_if_factory = False
not_in_factory_okish = False
if origin:
self.logger.info("expected origin is '%s'", origin)
origin_same = src_project.startswith(origin)
self.logger.info("expected origin is '%s' (%s)", origin,
"unchanged" if origin_same else "changed")
if origin.startswith('Devel;'):
(dummy, origin, dummy) = origin.split(';')
if origin != src_project:
@ -164,7 +166,7 @@ class Leaper(ReviewBot.ReviewBot):
if self.must_approve_maintenance_updates:
self.needs_release_manager = True
# submitted from :Update
if src_project.startswith(origin):
if origin_same:
self.logger.debug("submission from 42.2 ok")
return True
# switching to sle package might make sense