From d49f42ba752b3ecb3cf02b0b137fc422bfd7c76c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Feb 2008 13:14:05 -0600 Subject: Remove small remnant of old force=y option Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 598e6879..79c3fd17 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1284,7 +1284,7 @@ if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" \ fi fi -unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force +unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums unset replaces depends conflicts backup source install build makedepends unset optdepends options noextract -- cgit v1.2.3-70-g09d2 From 7613f2e21aa4df72e7a520b2cd80c592a0cb63a2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Feb 2008 22:10:28 -0600 Subject: contrib: add 'groups' keyword to PKGBUILD.vim Signed-off-by: Dan McGee --- contrib/PKGBUILD.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 86862e2e..b2a8d2f8 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -70,6 +70,11 @@ syn keyword pbArch i686 x86_64 ppc contained syn match pbIllegalArch /[^='() ]/ contained contains=pbArch syn match pbArchGroup /^arch=.*/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote +" groups +syn keyword pb_k_groups groups contained +syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained +syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote + " makedepends syn keyword pb_k_makedepends makedepends contained syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained @@ -195,6 +200,7 @@ hi def link pb_k_backup pbKeywords hi def link pb_k_arch pbKeywords hi def link pbIllegalArch Error +hi def link pb_k_groups pbKeywords hi def link pb_k_makedepends pbKeywords hi def link pb_k_depends pbKeywords hi def link pb_k_replaces pbKeywords -- cgit v1.2.3-70-g09d2 From aecc2fd19037d0580df9600628acace93cb0dd46 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Fri, 29 Feb 2008 23:26:02 +0100 Subject: Set a missing pm_errno in _alpm_pkg_load() Signed-off-by: Nagy Gabor Signed-off-by: Dan McGee --- lib/libalpm/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 363cf313..287c2ce4 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1080,7 +1080,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full) if(!config) { _alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile); - goto error; + goto pkg_invalid; } archive_read_finish(archive); -- cgit v1.2.3-70-g09d2