summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-06 18:55:26 -0400
committerDan McGee <dan@archlinux.org>2007-05-06 18:55:26 -0400
commit01bc7d7749dd95dea8482c5927e5fdf7354fdac1 (patch)
tree018f057f45700529ce09c9ac9894940b79061273
parent96f35d219cfd330f0c57e39619c85ef2e880eb16 (diff)
downloadpacman-01bc7d7749dd95dea8482c5927e5fdf7354fdac1.tar.xz
repo-add: fix conflicts instead of conflict bug
makepkg generates PKGINFO files with "conflict = ", repo-add was incorrectly looking for "conflicts = ". Signed-off-by: Dan McGee <dan@archlinux.org>
-rwxr-xr-xscripts/repo-add2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/repo-add b/scripts/repo-add
index 64962143..cf58585c 100755
--- a/scripts/repo-add
+++ b/scripts/repo-add
@@ -114,7 +114,7 @@ db_write_entry()
license=*) _licenses="$_licenses $license" ;;
replaces=*) _replaces="$_replaces $replaces" ;;
provides=*) _provides="$_provides $provides" ;;
- conflicts=*) _conflicts="$_conflicts $conflicts" ;;
+ conflict=*) _conflicts="$_conflicts $conflicts" ;;
esac
done