From 0cfb412220f3513e23aba9105d756246e5866ca6 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 18 Jun 2007 00:15:36 +0000
Subject: Check in changes for 3.0.5 release (mostly backports)

* Update the mirrorlist
* Fix FS7338- the previous repo-add fix didn't quite do the job, but it
  should be fixed now.
* Small updates to translations files
* Add -mtune=generic to default CFLAGS (req'd by GCC 4.2)
---
 scripts/repo-add | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/repo-add')

diff --git a/scripts/repo-add b/scripts/repo-add
index 45515d1b..642100d0 100755
--- a/scripts/repo-add
+++ b/scripts/repo-add
@@ -117,7 +117,7 @@ db_write_entry()
 			license=*) _licenses="$_licenses $license" ;;
 			replaces=*) _replaces="$_replaces $replaces" ;;
 			provides=*) _provides="$_provides $provides" ;;
-			conflict=*) _conflicts="$_conflicts $conflicts" ;;
+			conflict=*) _conflicts="$_conflicts $conflict" ;;
 		esac
 	done
 
-- 
cgit v1.2.3-24-g4f1b