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

[Git][ftp-team/dak][deploy] 7 commits: Fix 'Calling get_bugs with positional arguments is deprecated'

Title: GitLab

Ansgar pushed to branch deploy at Debian FTP Team / dak

Commits:

  • f207d79b
    by Scott Kitterman at 2022-10-19T17:24:52-04:00 
    Fix 'Calling get_bugs with positional arguments is deprecated'
  • 2064a01f
    by Scott Kitterman at 2022-10-19T18:22:24-04:00 
    Make rm.py change do a single query
  • c1339922
    by Ansgar at 2022-10-21T01:00:35+02:00 
    Merge remote-tracking branch 'origin/merge-requests/264'
  • 1f838fb5
    by Akbarkhon Variskhanov at 2022-11-02T17:26:19+05:00 
    template: Move the 'Thank you' message to the top
  • db63689c
    by Ansgar at 2022-11-07T17:28:55+01:00 
    Merge remote-tracking branch 'origin/merge-requests/265'
  • cdfb2b8e
    by Ansgar at 2022-12-01T12:08:37+01:00 
    apache.conf-ftp: redirect /.git to salsa.d.o

The redirect to a public Git hosting site hopefully tells people there
are no secrets here and there is no need to report /.git being
accessible.
  • 550bf251
    by Ansgar at 2022-12-01T12:11:53+01:00 
    Merge branch 'master' into deploy

4 changed files:

Changes:

  • config/debian/apache.conf-ftp
    ... ... @@ -11,6 +11,7 @@ Use common-debian-service-https-redirect * ftp-master.debian.org
    11 11 
       Use common-ssl-HSTS
    12 12 
       Use http-pkp-ftp-master.debian.org
    13 13
    14 
    +  Redirect permanent /.git https://salsa.debian.org/ftp-team/website.git
    14 15 
       Redirect permanent /proposed-updates.html https://release.debian.org/proposed-updates/stable.html
    15 16 
       Redirect permanent /oldstable-proposed-updates.html https://release.debian.org/proposed-updates/oldstable.html
    16 17 
       Redirect permanent /testing/hints/transitions.yaml https://ftp-master.debian.org/transitions.yaml

  • dak/bts_categorize.py
    ... ... @@ -101,7 +101,7 @@ class BugClassifier:
    101 101 
             for tags in tagged_bugs.keys():
    102 102 
                 tagged_bugs_ftp += tagged_bugs[tags]
    103 103
    104 
    -        return [bug for bug in bts.get_status(bts.get_bugs("package", "ftp.debian.org"))
    104 
    +        return [bug for bug in bts.get_status(bts.get_bugs(package="ftp.debian.org"))
    105 105 
                          if bug.pending == 'pending' and bug.bug_num not in tagged_bugs_ftp]
    106 106
    107 107 
         def classify_bug(self, bug):

  • daklib/rm.py
    ... ... @@ -556,7 +556,7 @@ def remove(session, reason, suites, removals,
    556 556 
                 Subst_close_other["__BUG_NUMBER_ALSO__"] = ""
    557 557 
                 Subst_close_other["__SOURCE__"] = source_pkg
    558 558 
                 merged_bugs = set()
    559 
    -            other_bugs = bts.get_bugs('src', source_pkg, 'status', 'open', 'status', 'forwarded')
    559 
    +            other_bugs = bts.get_bugs(src=source_pkg, status=('open', 'forwarded'))
    560 560 
                 if other_bugs:
    561 561 
                     for bugno in other_bugs:
    562 562 
                         if bugno not in merged_bugs:

  • templates/process-unchecked.accepted
    ... ... @@ -17,10 +17,10 @@ Content-Type: text/plain; charset="utf-8"
    17 17 
     Content-Transfer-Encoding: 8bit
    18 18 
     Subject: __CHANGES_FILENAME__ ACCEPTED into __SUITE__
    19 19
    20 
    +Thank you for your contribution to __DISTRO__.
    21 
    +
    20 22 
     __WARNINGS__
    21 23
    22 24 
     Accepted:
    23 25
    24 26 
     __FILE_CONTENTS__
    25 
    -
    26 
    -Thank you for your contribution to __DISTRO__.

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: