summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-06-18 02:15:36 +0200
committerDan McGee <dan@archlinux.org>2007-06-18 02:15:36 +0200
commit0cfb412220f3513e23aba9105d756246e5866ca6 (patch)
treea6c9d0e8ae5b5e764831c218342adf2c61724ea8 /scripts
parent5786c6e4a31b75fdb07f1e1e43741910053f559f (diff)
downloadpacman-0cfb412220f3513e23aba9105d756246e5866ca6.tar.gz
pacman-0cfb412220f3513e23aba9105d756246e5866ca6.tar.xz
Check in changes for 3.0.5 release (mostly backports)v3.0.5
* 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)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/repo-add2
1 files changed, 1 insertions, 1 deletions
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