Commit 07b8f542 authored by Seblu's avatar Seblu
Browse files

Use raw string for regex

parent 3d7903f1

src/lib/archversion/pacman.py

+5 −5
Original line number Diff line number Diff line
@@ -51,15 +51,15 @@ def pkgbuild_set_version(path, version, reset=True): 
    if a variable $_pkgver is present, this one will be updated instead of $pkgver

    If reset is True, $pkgrel will be set to 1

    '''

    wspces = "[ \t\r\f\v]"

    wspces = r"[ \t\r\f\v]"

    data = open(path, "r").read()

    # prefer to replace $_pkgver

    var = "pkgver" if re.search("^%s*_pkgver=" % wspces, data,

    var = "pkgver" if re.search(r"^%s*_pkgver=" % wspces, data,

        re.MULTILINE) is None else "_pkgver"

    data = re.sub("^(%s*%s=).*$" % (wspces, var),

        "\g<1>%s" % version, data, flags=re.MULTILINE)

    data = re.sub(r"^(%s*%s=).*$" % (wspces, var),

        r"\g<1>%s" % version, data, flags=re.MULTILINE)

    if reset:

        data = re.sub("^(%s*pkgrel=).*" % wspces, "\g<1>1", data,

        data = re.sub(r"^(%s*pkgrel=).*" % wspces, r"\g<1>1", data,

            flags=re.MULTILINE)

    open(path, "w").write(data)

src/lib/archversion/version.py

+5 −5
Original line number Diff line number Diff line
@@ -193,10 +193,10 @@ class VersionController(object): 
        url = value["url"]

        regex = value.get("regex", "%s%s(%s)%s" % (

                    value.get("regex_name", name),

                    value.get("regex_split", "[-_]v?"),

                    value.get("regex_version", "[-.\w]+"),

                    value.get("regex_split", r"[-_]v?"),

                    value.get("regex_version", r"[-.\w]+"),

                    value.get("regex_ext",

                              "\.(?:tar(?:\.gz|\.bz2|\.xz)?|tgz|tbz2|zip|zst)")))

                              r"\.(?:tar(?:\.gz|\.bz2|\.xz)?|tgz|tbz2|zip|zst)")))

        # retrieve config timeout

        timeout = float(value["timeout"]) if "timeout" in value else None

        # do it retry time + 1
@@ -217,7 +217,7 @@ class VersionController(object): 
                # list all found versions

                logging.debug("Found versions: %s" % v)

                # exclude versions

                regex_exclude = value.get("regex_exclude", ".*(rc|beta|alpha|pre).*")

                regex_exclude = value.get("regex_exclude", r".*(rc|beta|alpha|pre).*")

                if regex_exclude != "":

                    logging.debug("Exclusion regex: %s" % regex_exclude)

                    v -= set(filter(lambda x: re.search(regex_exclude, x), v))
@@ -252,7 +252,7 @@ class VersionController(object): 
        # looking into db for package name

        db, pkg = pacman.find_pkg(name, allowed_repos)

        if pkg is not None:

            epoch, pkgver, pkgrel = re.match("^(?:(\d+)\:)?([^-:]*)(?:-(\d+))?",

            epoch, pkgver, pkgrel = re.match(r"^(?:(\d+)\:)?([^-:]*)(?:-(\d+))?",

                pkg.version).groups()

            logging.debug("pacman version in %s: %s" % (db.name, pkgver))

            return pkgver