From b3e6cf652c9e989badaf5499abb1d64c1a110927 Mon Sep 17 00:00:00 2001
From: Chantry Xavier <shiningxc@gmail.com>
Date: Thu, 13 Mar 2008 16:36:44 +0100
Subject: Drop case insensitive comparisons in the config parsing.

These case insensitive comparisons didn't work in some locales, like tr_TR
where upper(i) != I. So a second case sensitive comparison had to be made
for each directive.
Only keeping case sensitive comparisons make the code cleaner and treat all
locales equally.

Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-March/011445.html

Also fix pactests to use the correct case.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 pactest/tests/remove030.py      | 2 +-
 pactest/tests/sync021.py        | 2 +-
 pactest/tests/sync120.py        | 2 +-
 pactest/tests/sync133.py        | 2 +-
 pactest/tests/sync138.py        | 2 +-
 pactest/tests/upgrade010.py     | 2 +-
 pactest/tests/upgrade070.py     | 2 +-
 pactest/tests/xfercommand001.py | 2 +-
 pactest/util.py                 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pactest')

diff --git a/pactest/tests/remove030.py b/pactest/tests/remove030.py
index cc23f144..9e2b9da5 100644
--- a/pactest/tests/remove030.py
+++ b/pactest/tests/remove030.py
@@ -3,7 +3,7 @@ self.description = "Remove a package in HoldPkg"
 p1 = pmpkg("dummy")
 self.addpkg2db("local", p1)
 
-self.option["holdpkg"] = ["dummy"]
+self.option["HoldPkg"] = ["dummy"]
 
 self.args = "-R %s" % p1.name
 
diff --git a/pactest/tests/sync021.py b/pactest/tests/sync021.py
index a4073eed..4c664d8e 100644
--- a/pactest/tests/sync021.py
+++ b/pactest/tests/sync021.py
@@ -12,7 +12,7 @@ sp3.groups = ["grp"]
 for p in sp1, sp2, sp3:
 	self.addpkg2db("sync", p);
 
-self.option["ignorepkg"] = ["pkg2"]
+self.option["IgnorePkg"] = ["pkg2"]
 
 self.args = "-S grp"
 
diff --git a/pactest/tests/sync120.py b/pactest/tests/sync120.py
index b8fc6747..994e440e 100644
--- a/pactest/tests/sync120.py
+++ b/pactest/tests/sync120.py
@@ -12,7 +12,7 @@ lp2 = pmpkg("pkg2")
 for p in lp1, lp2:
 	self.addpkg2db("local", p)
 
-self.option["ignorepkg"] = ["pkg2"]
+self.option["IgnorePkg"] = ["pkg2"]
 
 self.args = "-Su"
 
diff --git a/pactest/tests/sync133.py b/pactest/tests/sync133.py
index b852a7fc..cea603b8 100644
--- a/pactest/tests/sync133.py
+++ b/pactest/tests/sync133.py
@@ -9,7 +9,7 @@ lp = pmpkg("pkg1")
 
 self.addpkg2db("local", lp)
 
-self.option["ignorepkg"] = ["pkg1"]
+self.option["IgnorePkg"] = ["pkg1"]
 
 self.args = "-Su"
 
diff --git a/pactest/tests/sync138.py b/pactest/tests/sync138.py
index 410c7f07..e67c4f46 100644
--- a/pactest/tests/sync138.py
+++ b/pactest/tests/sync138.py
@@ -13,7 +13,7 @@ lp2 = pmpkg("pkg2")
 for p in lp1, lp2:
 	self.addpkg2db("local", p)
 
-self.option["ignoregroup"] = ["grp"]
+self.option["IgnoreGroup"] = ["grp"]
 
 self.args = "-Su"
 
diff --git a/pactest/tests/upgrade010.py b/pactest/tests/upgrade010.py
index 633ef7e4..3d8b21e1 100644
--- a/pactest/tests/upgrade010.py
+++ b/pactest/tests/upgrade010.py
@@ -8,7 +8,7 @@ p = pmpkg("dummy", "1.0-2")
 p.files = ["etc/dummy.conf"]
 self.addpkg(p)
 
-self.option["noupgrade"] = ["etc/dummy.conf"]
+self.option["NoUpgrade"] = ["etc/dummy.conf"]
 
 self.args = "-U %s" % p.filename()
 
diff --git a/pactest/tests/upgrade070.py b/pactest/tests/upgrade070.py
index 018a6b10..01f0ba48 100644
--- a/pactest/tests/upgrade070.py
+++ b/pactest/tests/upgrade070.py
@@ -5,7 +5,7 @@ p.files = ["bin/dummy",
            "usr/man/man1/dummy.1"]
 self.addpkg(p)
 
-self.option["noextract"] = ["usr/man/man1/dummy.1"]
+self.option["NoExtract"] = ["usr/man/man1/dummy.1"]
 
 self.args = "-U %s" % p.filename()
 
diff --git a/pactest/tests/xfercommand001.py b/pactest/tests/xfercommand001.py
index a9c41d8c..a645cf7f 100644
--- a/pactest/tests/xfercommand001.py
+++ b/pactest/tests/xfercommand001.py
@@ -3,7 +3,7 @@ self.description = "Quick check for using XferCommand"
 # this setting forces us to download packages
 self.cachepkgs = False
 #wget doesn't support file:// urls.  curl does
-self.option['xfercommand'] = ['/usr/bin/curl %u > %o']
+self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
 
 numpkgs = 10
 pkgnames = []
diff --git a/pactest/util.py b/pactest/util.py
index 2a6ff4e7..3f0b096a 100755
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -181,7 +181,7 @@ def mkcfgfile(filename, root, option, db):
 
     # Repositories
     data.extend(["[%s]\n" \
-                 "server = file://%s\n" \
+                 "Server = file://%s\n" \
                  % (value.treename, \
                     os.path.join(root, SYNCREPO, value.treename)) \
                  for key, value in db.iteritems() if key != "local"])
-- 
cgit v1.2.3-24-g4f1b