diff options
| author | Dan McGee <dan@archlinux.org> | 2008-03-01 16:24:42 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-03-01 16:24:42 -0600 |
| commit | 73ac9f7b27c3da538dad0f59c28f67badbb43a64 (patch) | |
| tree | a8dffd3a8076da7ebcd7bf4b92626caf92d0d7c5 | |
| parent | d734ebdde270c1e13e3b910e731bea88d874a51c (diff) | |
| parent | aecc2fd19037d0580df9600628acace93cb0dd46 (diff) | |
| download | pacman-73ac9f7b27c3da538dad0f59c28f67badbb43a64.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/PKGBUILD.vim | 6 | ||||
| -rw-r--r-- | lib/libalpm/package.c | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
3 files changed, 8 insertions, 2 deletions
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 diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d4341819..dbe3c982 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1103,7 +1103,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); 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 |