June 2010 - Arch-dev-public - lists.archlinux.org

[arch-dev-public] [signoff] libtool-2.2.10-1
by Allan McRae 10 Jun '10

10 Jun '10

Upstream update. Signoff both, Allan

2 1

[arch-dev-public] KDE 4.5 Beta 2
by Andrea Scarpino 09 Jun '10

09 Jun '10

Hi Arkers, KDE 4.5 Beta 2 is out and ready in [kde-unstable]. The first beta was unstable and broke (KDM, KHTML, random crash...), but this one can be used for desktop use IMHO. You should already know that kdepim 4.5 will not be packaged until KDE 4.5.1, said that these are the Arch Linux changes: -- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux

2 2

[arch-dev-public] [RFC] Rewrite early RTC device creation
by Thomas Bächler 09 Jun '10

09 Jun '10

Creating the RTC device will result in an error if devtmpfs is used, as it already exists after loading the module. The new code skips the mknod if the device is already present. Additionally to rtc-cmos, we now also try to load rtc and genrtc, as some custom kernels use the "old" misc RTC device instead of the newer RTC class. In this case, the created device is also different. This should fix FS#18078. --- rc.sysinit | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index 61b04c9..8349860 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -56,12 +56,18 @@ fi if [ -n "$HWCLOCK_PARAMS" ]; then # enable rtc access - /sbin/modprobe rtc-cmos >/dev/null 2>&1 - RTC_MAJOR=$(/bin/grep -w rtc /proc/devices 2>/dev/null) - RTC_MAJOR="${RTC_MAJOR%% *}" - if [ -n "$RTC_MAJOR" ]; then - /bin/mknod /dev/rtc0 c $RTC_MAJOR 0 - /bin/ln -s /dev/rtc0 /dev/rtc + /sbin/modprobe -q rtc-cmos + # some custom kernels use rtc/genrtc, try to load those too + /sbin/modprobe -q rtc + /sbin/modprobe -q genrtc + # If devtmpfs is used, the required RTC device already exists now + # Otherwise, create whatever device is available + if [ ! -c /dev/rtc -a ! -c /dev/rtc0 ]; then + if [ -f /sys/class/rtc/rtc0/dev ]; then + /bin/mknod /dev/rtc0 c $(cat /sys/class/rtc/rtc0/dev | sed 's|:| |') + elif [ -f /sys/class/misc/rtc/dev ]; then + /bin/mknod /dev/rtc c $(cat /sys/class/misc/rtc/dev | sed 's|:| |') + fi fi # Do a clock set here for a few reasons: -- 1.7.1

2 3

[arch-dev-public] [RFC] Initialize /etc/mtab by copying /proc/mounts
by Thomas Bächler 09 Jun '10

09 Jun '10

Our current process of initializing /etc/mtab is hackish and probably error-prone, replace it by simply copying /proc/mounts. --- rc.sysinit | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index 8349860..b78d3e7 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -295,13 +295,7 @@ fi stat_busy "Mounting Local Filesystems" /bin/mount -n -o remount,rw / -: >| /etc/mtab -# make sure / gets written to /etc/mtab -/bin/mount -o remount,rw / -# Write /proc, /sys and /dev to /etc/mtab -if [ -e /proc/mounts ]; then - /bin/grep -e "/proc " -e "/sys " -e "/dev " /proc/mounts >> /etc/mtab -fi +cat /proc/mounts >| /etc/mtab run_hook sysinit_premount # now mount all the local filesystems /bin/mount -a -t $NETFS -O no_netdev -- 1.7.1

2 2

[arch-dev-public] [PATCH] Do not refer to $startdir/{src, pkg} in PKGBUILDs
by Allan McRae 08 Jun '10

08 Jun '10

PKGBUILDs should always use $srcdir and $pkgdir and their locations are not guaranteed to be $startdir/src and $startdir/pkg respecitively. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Namcap/invalidstartdir.py | 6 +++--- namcap-tags | 6 +++--- namcap.1 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Namcap/invalidstartdir.py b/Namcap/invalidstartdir.py index 69a6969..052b380 100644 --- a/Namcap/invalidstartdir.py +++ b/Namcap/invalidstartdir.py @@ -23,7 +23,7 @@ class package: def short_name(self): return "invalidstartdir" def long_name(self): - return "Looks for anything that's not $startdir/pkg or $startdir/src" + return "Looks for references to $startdir" def prereq(self): return "" def analyze(self, pkginfo, tar): @@ -34,9 +34,9 @@ class package: if j[:4] != '/pkg' and j[:4] != '/src': ret[0].append(("file-referred-in-startdir", ())) elif j[:4] == '/pkg': - ret[2].append(("recommend-use-pkgdir", ())) + ret[0].append(("use-pkgdir", ())) elif j[:4] == '/src': - ret[2].append(("recommend-use-srcdir", ())) + ret[0].append(("use-srcdir", ())) return ret def type(self): return "pkgbuild" diff --git a/namcap-tags b/namcap-tags index c144f06..c4b1b3d 100644 --- a/namcap-tags +++ b/namcap-tags @@ -25,7 +25,7 @@ empty-directory %s :: Directory (%s) is empty extra-var-begins-without-underscore %s :: Non standard variable '%s' doesn't start with an underscore file-in-non-standard-dir %s :: File (%s) exists in a non-standard directory. file-not-world-readable %s :: File (%s) does not have the world readable bit set. -file-referred-in-startdir :: File referenced in $startdir outside of $startdir/src or $startdir/pkg +file-referred-in-startdir :: File referenced in $startdir file-world-writable %s :: File (%s) has the world writable bit set. gnome-mime-file %s :: File (%s) is an auto-generated GNOME mime file hardlink-found %s points to %s :: Hard link (%s) found that points to %s @@ -56,13 +56,13 @@ perllocal-pod-present %s :: perllocal.pod found in %s. pkgname-in-description :: Description should not contain the package name. potential-non-fhs-info-page %s :: Potential non-FHS info page (%s) found. potential-non-fhs-man-page %s :: Potential non-FHS man page (%s) found. -recommend-use-pkgdir :: Recommend use of $pkgdir instead of $startdir/pkg -recommend-use-srcdir :: Recommend use of $srcdir instead of $startdir/src script-link-detected %s in %s :: Script link detected (%s) in file %s scrollkeeper-dir-exists %s :: Scrollkeeper directory exists (%s). Remember to not run scrollkeeper till post_{install,upgrade,remove}. specific-host-type-used %s :: Reference to one of %s should be changed to $CARCH specific-sourceforge-mirror :: Attempting to use specific sourceforge mirror, use downloads.sourceforge.net instead symlink-found %s points to %s :: Symlink (%s) found that points to %s too-many-md5sums %i needed :: Too Many md5sums: %i needed +use-pkgdir :: Use $pkgdir instead of $startdir/pkg +use-srcdir :: Use $srcdir instead of $startdir/src using-dl-sourceforge :: Attempting to use dl sourceforge domain, use downloads.sourceforge.net instead variable-not-array %s :: Variable %s is not an array. diff --git a/namcap.1 b/namcap.1 index f03186c..ea0a65a 100644 --- a/namcap.1 +++ b/namcap.1 @@ -77,7 +77,7 @@ files in /usr/share/icons/hicolor Verifies that a package does not contain the info directory file (/usr/share/info/dir) .TP .B invalidstartdir -Any PKGBUILDs that refer to files not stored in $startdir/pkg or $startdir/src are incorrect +Any PKGBUILDs that refer to files in $startdir are incorrect .TP .B libtool Warns if libtool (*.la) files are present -- 1.7.1

3 4

Re: [arch-dev-public] Namcap release coming soon
by Dan McGee 08 Jun '10

08 Jun '10

On Tue, Jun 8, 2010 at 9:56 AM, Dan McGee <dpmcgee(a)gmail.com> wrote: > Forwarding to the public list is your best option; going to one > developer is a good way for your email to get lost. > > ---------- Forwarded message ---------- > From: Guillaume ALAUX <guillaume(a)alaux.net> > Date: Tue, Jun 8, 2010 at 9:54 AM > Subject: Re: [arch-dev-public] Namcap release coming soon > To: dpmcgee(a)gmail.com > > > Hi Dan, > Didn't really how to answer your mail as I don't have write access to > the list so I'm just answering directly to you: >> If anyone [...] knows of very small issues that need fixing ... > When namcap'ing a package including scripts that use '#!/bin/sh' > instead of '#!/bin/bash', output is something like the following: > pkgname E: Dependency detected and not included (sh) from files ['script.sh'] > (I know the AL standard page on the wiki says we should use bash > rather than sh but these are scripts included in the original > tarball.) > As we don't have any sh package that error sounds strange to me (I > have this "issue" on one of my packages in AUR) > Should we change these scripts so that they use bash instead of sh or > should we change namcap in order for it not to yield such error? Namcap needs to be fixed to recognize provides. The bash package currently provides sh, so there should be no error here. -Dan

1 0

[arch-dev-public] Namcap release coming soon
by Dan McGee 08 Jun '10

08 Jun '10

Hey guys, Allan and I have made a few patches to namcap in the last 24 hours and we think it would be good to get a release out there. Here is the log: http://projects.archlinux.org/namcap.git/log/ If anyone has any pending patches (doubtful) or knows of very small issues that need fixing and won't take a lot of dev time, bring them up now if we want to sneak them into the release. -Dan

1 0

[arch-dev-public] [PATCH] Check all checksum types
by Allan McRae 08 Jun '10

08 Jun '10

Check every checksum that makepkg supports rather than only md5sums. Fixes FS#17168. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I am sure there has to be some way to loop through all that duplication, but the how escapes me... Namcap/__init__.py | 2 +- Namcap/arrays.py | 3 +- Namcap/checksums.py | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ Namcap/extravars.py | 3 +- Namcap/md5sums.py | 44 -------------------------- namcap-tags | 8 ++-- namcap.1 | 6 ++-- parsepkgbuild | 21 ++++++++++++ 8 files changed, 119 insertions(+), 54 deletions(-) create mode 100644 Namcap/checksums.py delete mode 100644 Namcap/md5sums.py diff --git a/Namcap/__init__.py b/Namcap/__init__.py index 77aa63b..457902a 100644 --- a/Namcap/__init__.py +++ b/Namcap/__init__.py @@ -47,9 +47,9 @@ __pkgbuild__ = """ badbackups capsnames carch + checksums invalidstartdir license - md5sums pkgname rpath sfurl diff --git a/Namcap/arrays.py b/Namcap/arrays.py index e3111aa..3ecb1ed 100644 --- a/Namcap/arrays.py +++ b/Namcap/arrays.py @@ -29,7 +29,8 @@ class package: def analyze(self, pkginfo, tar): arrayvars = ['arch', 'license', 'depends', 'makedepends', 'optdepends', 'provides', 'conflicts' , 'replaces', - 'backup', 'source', 'noextract', 'md5sums'] + 'backup', 'source', 'noextract', 'md5sums', + 'sha1sums', 'sha256sums', 'sha384sums', 'sha512sums'] ret = [[], [], []] for i in pkginfo.pkgbuild: m = re.match('\s*(.*)\s*=\s*(.*)\n', i) diff --git a/Namcap/checksums.py b/Namcap/checksums.py new file mode 100644 index 0000000..157f0b5 --- /dev/null +++ b/Namcap/checksums.py @@ -0,0 +1,86 @@ +# +# namcap rules - checksums +# Copyright (C) 2003-2009 Jason Chu <jason(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +class package: + def short_name(self): + return "checksums" + def long_name(self): + return "Verifies checksums are included in a PKGBUILD" + def prereq(self): + return "" + def analyze(self, pkginfo, tar): + ret = [[],[],[]] + checksums=['md5', 'sha1', 'sha256', 'sha384', 'sha512'] + if hasattr(pkginfo, 'source'): + haschecksums=False + for i in checksums: + if hasattr(pkginfo, i+'sums'): + haschecksums=True + if not haschecksums: + ret[0].append(("missing-checksums", ())) + + if hasattr(pkginfo, 'md5sums'): + if len(pkginfo.source) > len(pkginfo.md5sums): + ret[0].append(("not-enough-checksums %s %i needed", ('md5sums', len(pkginfo.source)))) + elif len(pkginfo.source) < len(pkginfo.md5sums): + ret[0].append(("too-many-checksums %s %i needed", ('md5sums', len(pkginfo.source)))) + for sum in pkginfo.md5sums: + if len(sum) != 32: + ret[0].append(("improper-checksum %s %s", ('md5sums', sum))) + + if hasattr(pkginfo, 'sha1sums'): + if len(pkginfo.source) > len(pkginfo.sha1sums): + ret[0].append(("not-enough-checksums %s %i needed", ('sha1sums', len(pkginfo.source)))) + elif len(pkginfo.source) < len(pkginfo.sha1sums): + ret[0].append(("too-many-checksums %s %i needed", ('sha1sums', len(pkginfo.source)))) + for sum in pkginfo.sha1sums: + if len(sum) != 40: + ret[0].append(("improper-checksum %s %s", ('sha1sums', sum))) + + if hasattr(pkginfo, 'sha256sums'): + if len(pkginfo.source) > len(pkginfo.sha256sums): + ret[0].append(("not-enough-checksums %s %i needed", ('sha256sums', len(pkginfo.source)))) + elif len(pkginfo.source) < len(pkginfo.sha256sums): + ret[0].append(("too-many-checksums %s %i needed", ('sha256sums', len(pkginfo.source)))) + for sum in pkginfo.sha256sums: + if len(sum) != 63: + ret[0].append(("improper-checksum %s %s", ('sha256sums', sum))) + + if hasattr(pkginfo, 'sha384sums'): + if len(pkginfo.source) > len(pkginfo.sha384sums): + ret[0].append(("not-enough-checksums %s %i needed", ('sha384sums', len(pkginfo.source)))) + elif len(pkginfo.source) < len(pkginfo.sha384sums): + ret[0].append(("too-many-checksums %s %i needed", ('sha384sums', len(pkginfo.source)))) + for sum in pkginfo.sha384sums: + if len(sum) != 96: + ret[0].append(("improper-checksum %s %s", ('sha384sums', sum))) + + if hasattr(pkginfo, 'sha512sums'): + if len(pkginfo.source) > len(pkginfo.sha512sums): + ret[0].append(("not-enough-checksums %s %i needed", ('sha512sums', len(pkginfo.source)))) + elif len(pkginfo.source) < len(pkginfo.sha512sums): + ret[0].append(("too-many-checksums %s %i needed", ('sha512sums', len(pkginfo.source)))) + for sum in pkginfo.sha512sums: + if len(sum) != 128: + ret[0].append(("improper-checksum %s %s", ('sha512sums', sum))) + + return ret + def type(self): + return "pkgbuild" +# vim: set ts=4 sw=4 noet: diff --git a/Namcap/extravars.py b/Namcap/extravars.py index aebeb64..ac5a2ab 100644 --- a/Namcap/extravars.py +++ b/Namcap/extravars.py @@ -29,7 +29,8 @@ class package: def analyze(self, pkginfo, tar): stdvars = ['arch', 'license', 'depends', 'makedepends', 'provides', 'conflicts' , 'replaces', 'backup', - 'source', 'noextract', 'md5sums', 'pkgname', + 'source', 'noextract', 'md5sums', 'sha1sums', + 'sha256sums', 'sha384sums', 'sha512sums', 'pkgname', 'pkgver', 'pkgrel', 'pkgdesc', 'url', 'install'] ret = [[], [], []] for i in pkginfo.pkgbuild: diff --git a/Namcap/md5sums.py b/Namcap/md5sums.py deleted file mode 100644 index 0d60cd7..0000000 --- a/Namcap/md5sums.py +++ /dev/null @@ -1,44 +0,0 @@ -# -# namcap rules - md5sums -# Copyright (C) 2003-2009 Jason Chu <jason(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -class package: - def short_name(self): - return "md5sums" - def long_name(self): - return "Verifies md5sums are included in a PKGBUILD" - def prereq(self): - return "" - def analyze(self, pkginfo, tar): - ret = [[], [], []] - if hasattr(pkginfo, 'source'): - if not hasattr(pkginfo, 'md5sums'): - ret[0].append(("missing-md5sums", ())) - else: - if len(pkginfo.source) > len(pkginfo.md5sums): - ret[0].append(("not-enough-md5sums %i needed", len(pkginfo.source))) - elif len(pkginfo.source) < len(pkginfo.md5sums): - ret[0].append(("too-many-md5sums %i needed", len(pkginfo.source))) - if hasattr(pkginfo, 'md5sums'): - for sum in pkginfo.md5sums: - if len(sum) != 32: - ret[0].append(("improper-md5sum %s", sum)) - return ret - def type(self): - return "pkgbuild" -# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index c4b1b3d..acb8e9c 100644 --- a/namcap-tags +++ b/namcap-tags @@ -30,7 +30,7 @@ file-world-writable %s :: File (%s) has the world writable bit set. gnome-mime-file %s :: File (%s) is an auto-generated GNOME mime file hardlink-found %s points to %s :: Hard link (%s) found that points to %s hicolor-icon-cache-not-updated :: Files in /usr/share/icons/hicolor but no call to gtk-update-icon-cache or xdg-icon-resource to update the icon cache -improper-md5sum %s :: Improper md5sum: '%s' +improper-checksum %s %s :: Improper %s: '%s' incorrect-library-permissions %s :: Library (%s) does not have permission set to 644 or 444 incorrect-permissions %s (%s/%s) :: File (%s) has %s/%s permissions info-dir-file-present %s :: Info directory file (%s) should not be present @@ -45,12 +45,12 @@ missing-custom-license-dir usr/share/licenses/%s :: Missing custom license direc missing-custom-license-file usr/share/licenses/%s/* :: Missing custom license file in package (usr/share/licenses/%s/*) missing-license :: Missing license missing-maintainer :: Missing Maintainer tag -missing-md5sums :: Missing md5sums +missing-checksums :: Missing checksums missing-url :: Missing url non-fhs-info-page %s :: Non-FHS info page (%s) found. Use /usr/share/info instead non-fhs-man-page %s :: Non-FHS man page (%s) found. Use /usr/share/man instead not-a-common-license %s :: %s is not a common license (it's not in /usr/share/licenses/common/) -not-enough-md5sums %i needed :: Not enough md5sums: %i needed +not-enough-checksums %s %i needed :: Not enough %s: %i needed package-name-in-uppercase :: No upper case letters in package names perllocal-pod-present %s :: perllocal.pod found in %s. pkgname-in-description :: Description should not contain the package name. @@ -61,7 +61,7 @@ scrollkeeper-dir-exists %s :: Scrollkeeper directory exists (%s). Remember to no specific-host-type-used %s :: Reference to one of %s should be changed to $CARCH specific-sourceforge-mirror :: Attempting to use specific sourceforge mirror, use downloads.sourceforge.net instead symlink-found %s points to %s :: Symlink (%s) found that points to %s -too-many-md5sums %i needed :: Too Many md5sums: %i needed +too-many-checksums %s %i needed :: Too many %s: %i needed use-pkgdir :: Use $pkgdir instead of $startdir/pkg use-srcdir :: Use $srcdir instead of $startdir/src using-dl-sourceforge :: Attempting to use dl sourceforge domain, use downloads.sourceforge.net instead diff --git a/namcap.1 b/namcap.1 index ea0a65a..3ee9075 100644 --- a/namcap.1 +++ b/namcap.1 @@ -40,6 +40,9 @@ Checks a PKGBUILD to verify that the package name has no upper case characters .B capsnamespkg Checks a package to verify that the package name has no upper case characters .TP +.B checksums +Makes sure that a PKGBUILD includes valid checksums +.TP .B depends This module runs ldd on all executables, gets the link-level dependencies, finds the smallest subset of dependencies that cover the link-level dependencies, and compares that list to the depends of the package. It returns messages in three cases: dependency detected and not included, dependency included but already satisfied, and dependency included and not needed. These suggestions are just guidelines and all package builders should take this into account (i.e. you're smarter than namcap is) @@ -90,9 +93,6 @@ Verifies that the licenses variable has been filled in in a package. For package checks whether the license file has been installed in /usr/share/licenses/$pkgname/ .TP -.B md5sums -Makes sure that a PKGBUILD includes the md5sums -.TP .B mimefiles Checks whether update-mime-database is called when the package installs files in /usr/share/mime .TP diff --git a/parsepkgbuild b/parsepkgbuild index 295416b..f9b5a91 100755 --- a/parsepkgbuild +++ b/parsepkgbuild @@ -94,6 +94,27 @@ if [ -n "\$md5sums" ]; then for i in \${md5sums[@]}; do echo \$i; done echo "" fi +if [ -n "\$sha1sums" ]; then + echo "%SHA1SUMS%" + for i in \${sha1sums[@]}; do echo \$i; done + echo "" +fi +if [ -n "\$sha256sums" ]; then + echo "%SHA256SUMS%" + for i in \${sha256sums[@]}; do echo \$i; done + echo "" +fi +if [ -n "\$sha384sums" ]; then + echo "%SHA384SUMS%" + for i in \${sha384sums[@]}; do echo \$i; done + echo "" +fi +if [ -n "\$sha512sums" ]; then + echo "%SHA512SUMS%" + for i in \${sha512sums[@]}; do echo \$i; done + echo "" +fi + [ -n "\$install" ] && echo -e "%INSTALL%\n\$install\n" -- 1.7.1

2 2

[arch-dev-public] [PATCH 1/2] Handle optdepends description stripping correctly
by Dan McGee 08 Jun '10

08 Jun '10

Commit 95986ec3 attempted to fix handling of optdepends with descriptions, but it only affected the PKGBUILD parser. Do the description stripping in the package building code in namcap proper so we can handle all varieties of packages, whether from a PKGBUILD, the database, or a package file. The original fix is reverted as part of this commit, and this fixes FS#18259. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pacman.py | 8 +++++++- parsepkgbuild | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pacman.py b/pacman.py index 2fb64e2..fd367d7 100644 --- a/pacman.py +++ b/pacman.py @@ -47,12 +47,18 @@ class PacmanPackage(object): def clean_depends(self): """ - Go through the special depends instance property, copy it to self.orig_depends and strip all the depend version info off ('neon>=0.25.5-4' => 'neon') + Go through the special depends instance property and strip all the depend version info off ('neon>=0.25.5-4' => 'neon'). + Also clean our optdepends and remove any trailing description. + The original arrays are copied to orig_depends and orig_optdepends respectively. """ if hasattr(self, 'depends'): self.orig_depends = self.depends[:] for item, value in enumerate(self.depends): self.depends[item] = value.split('>')[0].split('<')[0].split('=')[0] + if hasattr(self, 'optdepends'): + self.orig_optdepends = self.optdepends[:] + for item, value in enumerate(self.optdepends): + self.optdepends[item] = value.split(':')[0].split('>')[0].split('<')[0].split('=')[0] def process(self): """ diff --git a/parsepkgbuild b/parsepkgbuild index a9ab894..295416b 100755 --- a/parsepkgbuild +++ b/parsepkgbuild @@ -61,7 +61,7 @@ if [ -n "\$makedepends" ]; then fi if [ -n "\$optdepends" ]; then echo "%OPTDEPENDS%" - for i in \${!optdepends[*]}; do echo \${optdepends[\$i]%:*}; done + for i in \${optdepends[@]}; do echo \$i; done echo "" fi if [ -n "\$conflicts" ]; then -- 1.7.1

1 1

[arch-dev-public] [signoff] dash 0.5.6.1-1
by Dan McGee 07 Jun '10

07 Jun '10

Upstream update with minor fixes, please signoff. -Dan

1 0