[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] 2 commits: Show lintian version in output.



Title: GitLab

Ansgar Burchardt pushed to branch master at Debian FTP Team / dak

Commits:

1 changed file:

Changes:

  • dak/examine_package.py
    ... ... @@ -573,7 +573,8 @@ def check_dsc(suite, dsc_filename, session=None):
    573 573
         dsc_basename = os.path.basename(dsc_filename)
    
    574 574
         return foldable_output(dsc_filename, "dsc", dsc, norow=True) + \
    
    575 575
                "\n" + \
    
    576
    -           foldable_output("lintian check for %s" % dsc_basename,
    
    576
    +           foldable_output("lintian {} check for {}".format(
    
    577
    +                get_lintian_version(), dsc_basename),
    
    577 578
                    "source-lintian", do_lintian(dsc_filename)) + \
    
    578 579
                "\n" + \
    
    579 580
                foldable_output("README.source for %s" % dsc_basename,
    
    ... ... @@ -596,7 +597,8 @@ def check_deb(suite, deb_filename, session=None):
    596 597
             result += foldable_output("skipping lintian check for udeb",
    
    597 598
                 "binary-%s-lintian" % packagename, "") + "\n"
    
    598 599
         else:
    
    599
    -        result += foldable_output("lintian check for %s" % (filename),
    
    600
    +        result += foldable_output("lintian {} check for {}".format(
    
    601
    +                                  get_lintian_version(), filename),
    
    600 602
                 "binary-%s-lintian" % packagename, do_lintian(deb_filename)) + "\n"
    
    601 603
     
    
    602 604
         result += foldable_output("contents of %s" % (filename), "binary-%s-contents" % packagename,
    
    ... ... @@ -707,6 +709,16 @@ def main():
    707 709
                 utils.warn("[examine-package] Caught C-c; skipping.")
    
    708 710
                 pass
    
    709 711
     
    
    712
    +
    
    713
    +def get_lintian_version():
    
    714
    +    if not hasattr(get_lintian_version, '_version'):
    
    715
    +        # eg. "Lintian v2.5.100"
    
    716
    +        val = do_command(['lintian', '--version'])
    
    717
    +        get_lintian_version._version = val.split(' v')[-1].strip()
    
    718
    +
    
    719
    +    return get_lintian_version._version
    
    720
    +
    
    721
    +
    
    710 722
     #######################################################################################
    
    711 723
     
    
    712 724
     if __name__ == '__main__':
    


  • Reply to: