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

[Git][ftp-team/dak][master] 2 commits: improve UTF8 handling



Title: GitLab

Thorsten Alteholz pushed to branch master at Debian FTP Team / dak

Commits:

2 changed files:

Changes:

  • dak/examine_package.py
    ... ... @@ -591,11 +591,11 @@ def get_readme_source(dsc_filename):
    591 591
     def check_dsc(suite, dsc_filename, session=None):
    
    592 592
         dsc = read_changes_or_dsc(suite, dsc_filename, session)
    
    593 593
         dsc_basename = os.path.basename(dsc_filename)
    
    594
    -    return foldable_output(dsc_filename, "dsc", dsc, norow=True) + \
    
    594
    +    return foldable_output(dsc_filename, "dsc", dsc, norow=True).encode('utf8') + \
    
    595 595
                "\n" + \
    
    596 596
                foldable_output("lintian {} check for {}".format(
    
    597 597
                     get_lintian_version(), dsc_basename),
    
    598
    -               "source-lintian", do_lintian(dsc_filename)) + \
    
    598
    +               "source-lintian", do_lintian(dsc_filename)).encode('utf8') + \
    
    599 599
                "\n" + \
    
    600 600
                foldable_output("README.source for %s" % dsc_basename,
    
    601 601
                    "source-readmesource", get_readme_source(dsc_filename))
    
    ... ... @@ -648,7 +648,7 @@ def display_changes(suite, changes_filename):
    648 648
         global printed
    
    649 649
         changes = read_changes_or_dsc(suite, changes_filename)
    
    650 650
         printed.copyrights = {}
    
    651
    -    return foldable_output(changes_filename, "changes", changes, norow=True)
    
    651
    +    return foldable_output(changes_filename, "changes", changes, norow=True).encode('utf8')
    
    652 652
     
    
    653 653
     
    
    654 654
     def check_changes(changes_filename):
    

  • dak/process_new.py
    ... ... @@ -364,7 +364,7 @@ def check_pkg(upload, upload_copy, session):
    364 364
         handler = PolicyQueueUploadHandler(upload, session)
    
    365 365
         missing = [(m['type'], m["package"]) for m in handler.missing_overrides(hints=missing)]
    
    366 366
     
    
    367
    -    less_cmd = ("less", "-R", "-")
    
    367
    +    less_cmd = ("less", "-r", "-")
    
    368 368
         less_process = daklib.daksubprocess.Popen(less_cmd, bufsize=0, stdin=subprocess.PIPE)
    
    369 369
         try:
    
    370 370
             sys.stdout = less_process.stdin
    


  • Reply to: