[arch-dev-public] [PATCH] check_packages : improve the "skip klibc dep" hack.
It is not possible to check the klibc dep on the PKGBUILD level, so I made a hack to skip it. This hack broke on klibc-jfflyAahxqaliwAofrf_fdf5upI because of the underscore. But we can simply use the \w regexp which matches any alpha-numeric char, including underscore. Also the length of this string is always 27 chars, so we can use that. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> --- cron-jobs/check_archlinux/check_packages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index 2d2efbe..cdc7551 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -363,7 +363,7 @@ for name,pkg in repopkgs.iteritems(): # ugly hack to strip the weird kblic- deps for name,pkg in packages.iteritems(): - p = re.compile('klibc-[A-Za-z0-9]{20,}|klibc-\*') + p = re.compile('klibc-\w{27}|klibc-\*') pkg.deps = [dep for dep in pkg.deps if not p.match(dep)] pkg.makedeps = [dep for dep in pkg.makedeps if not p.match(dep)] -- 1.6.0.2
On Fri, Sep 26, 2008 at 7:28 PM, Xavier Chantry <shiningxc@gmail.com> wrote:
It is not possible to check the klibc dep on the PKGBUILD level, so I made a hack to skip it. This hack broke on klibc-jfflyAahxqaliwAofrf_fdf5upI because of the underscore. But we can simply use the \w regexp which matches any alpha-numeric char, including underscore. Also the length of this string is always 27 chars, so we can use that.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> --- cron-jobs/check_archlinux/check_packages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index 2d2efbe..cdc7551 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -363,7 +363,7 @@ for name,pkg in repopkgs.iteritems():
# ugly hack to strip the weird kblic- deps for name,pkg in packages.iteritems(): - p = re.compile('klibc-[A-Za-z0-9]{20,}|klibc-\*') + p = re.compile('klibc-\w{27}|klibc-\*') pkg.deps = [dep for dep in pkg.deps if not p.match(dep)] pkg.makedeps = [dep for dep in pkg.makedeps if not p.match(dep)]
-- 1.6.0.2
I asked klibc developer, he said it could be alphanumeric or dash or underscore. So I guess my patch is not correct since it does not handle dash :P
It is not possible to check the klibc dep on the PKGBUILD level, so I made a hack to skip it. This hack broke on klibc-jfflyAahxqaliwAofrf_fdf5upI because of the underscore. But we can simply use the \w regexp which matches any alpha-numeric char, including underscore. According to klibc developer, dashes are possible too. Also the length of this string is always 27 chars, so we can use that. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> --- cron-jobs/check_archlinux/check_packages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index 2d2efbe..69b14c3 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -363,7 +363,7 @@ for name,pkg in repopkgs.iteritems(): # ugly hack to strip the weird kblic- deps for name,pkg in packages.iteritems(): - p = re.compile('klibc-[A-Za-z0-9]{20,}|klibc-\*') + p = re.compile('klibc-[\w\-]{27}|klibc-\*') pkg.deps = [dep for dep in pkg.deps if not p.match(dep)] pkg.makedeps = [dep for dep in pkg.makedeps if not p.match(dep)] -- 1.6.0.2
participants (3)
-
Aaron Griffin
-
Xavier
-
Xavier Chantry