• Bug#1033837: marked as done (unblock: devscripts/2.23.3) (3/3)

    From Debian Bug Tracking System@21:1/5 to All on Sun Apr 2 20:10:01 2023
    [continued from previous message]

    - top_patch=$(quilt top)
    - echo "Top patch: $top_patch"
    + if [ -e $QUILT_PATCHES ]; then
    + top_patch=$(quilt top)
    + echo "Top patch: $top_patch"
    + fi
    if [ -e $PREFIX/$1 ]; then
    # if it's an existing patch and we are at the end of the stack,
    # go back at the beginning
    @@ -141,8 +143,10 @@
    # use a sub-shell
    quilt shell
    quilt refresh
    - echo "Reverting quilt back to $top_patch"
    - quilt pop $top_patch
    + if [ -n $top_patch ]; then
    + echo "Reverting quilt back to $top_patch"
    + quilt pop $top_patch
    + fi
    vcs_add $PREFIX/$1 $PREFIX/series
    }

    diff -Nru devscripts-2.23.2/scripts/sadt devscripts-2.23.3/scripts/sadt
    --- devscripts-2.23.2/scripts/sadt 2023-02-18 23:50:46.000000000 +0100
    +++ devscripts-2.23.3/scripts/sadt 2023-03-01 00:23:53.000000000 +0100
    @@ -346,7 +346,7 @@
    for package in packages:
    or_clauses += [
    stripped_or_clause
    - + [dict(name=package, version=None, arch=None)]
    + + [{"name": package, "version": None, "arch": None}]
    ]
    else:
    or_clauses += [or_clause]
    diff -Nru devscripts-2.23.2/scripts/suspicious-source devscripts-2.23.3/scripts/suspicious-source
    --- devscripts-2.23.2/scripts/suspicious-source 2023-02-05 00:33:58.000000000 +0100
    +++ devscripts-2.23.3/scripts/suspicious-source 2023-03-02 15:33:09.000000000 +0100
    @@ -75,8 +75,8 @@
    "text/x-perl",
    "text/x-php",
    "text/x-po",
    - "text/x-python",
    "text/x-ruby",
    + "text/x-script.python",
    "text/x-shellscript",
    "text/x-tex",
    "text/x-texinfo",