MFhead @ r291038

5 files changed, 49 insertions, 19 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 694a774..1ef88ff 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4505,6 +4505,12 @@ OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
@@ -4523,6 +4529,12 @@ OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
@@ -4595,6 +4607,12 @@ OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
@@ -4631,6 +4649,12 @@ OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
@@ -4787,6 +4811,12 @@ OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
diff --git a/tools/install.sh b/tools/install.sh
index c28bd89..e39f6ce 100644
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -63,7 +63,7 @@ fi
 # the remaining arguments are assumed to be files/dirs only.
 if [ -n "${linkmode}" ]; then
 	if [ "${linkmode}" = "symbolic" ]; then
-		ln -fsh "$@"
+		ln -fsn "$@"
 	else
 		ln -f "$@"
 	fi
diff --git a/tools/sched/schedgraph.py b/tools/sched/schedgraph.py
index f0552ca..0723dc3 100644
--- a/tools/sched/schedgraph.py
+++ b/tools/sched/schedgraph.py
@@ -461,7 +461,7 @@ class SourceStats(Toplevel):
 			if (event.type == "pad"):
 				continue
 			duration = event.duration
-			if (eventtypes.has_key(event.name)):
+			if (event.name in eventtypes):
 				(c, d) = eventtypes[event.name]
 				c += 1
 				d += duration
@@ -1069,7 +1069,7 @@ class KTRFile:
 
 	def makeid(self, group, id, type):
 		tag = group + id
-		if (self.taghash.has_key(tag)):
+		if (tag in self.taghash):
 			return self.taghash[tag]
 		if (type == "counter"):
 			source = Counter(group, id)
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index 3d74b8d..0b6551a 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -28,7 +28,7 @@
 
 	-->
 	<language name="af"
-		encoding="ISO8859-1"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="ZA" />
 	<language name="am"
 		countries="ET" />		<!-- UTF-8 only -->
@@ -60,7 +60,7 @@
 		encoding="ISO8859-1 ISO8859-15 US-ASCII"
 		countries="GB" />
 	<language name="en"
-		encoding="ISO8859-1 US-ASCII"
+		encoding="ISO8859-1 ISO8859-15 US-ASCII"
 		countries="AU CA NZ US ZA" />
 	<language name="en"
 		encoding="ISO8859-1 ISO8859-15"
@@ -91,7 +91,7 @@
 		encoding="ISO8859-1 ISO8859-15"
 		countries="BE CH FR" />
 	<language name="fr"
-		encoding="ISO8859-1"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="CA" />
 	<language name="he"
 		countries="IL" />
diff --git a/tools/tools/shlib-compat/shlib-compat.py b/tools/tools/shlib-compat/shlib-compat.py
index ca6f036..c0fb2d2 100755
--- a/tools/tools/shlib-compat/shlib-compat.py
+++ b/tools/tools/shlib-compat/shlib-compat.py
@@ -130,7 +130,7 @@ class Cache(object):
             self.stats = stats
 
     def get(self, id):
-        if self.enabled and self.items.has_key(id):
+        if self.enabled and id in self.items:
             self.stats.hit += 1
             return self.items[id]
         else:
@@ -139,7 +139,7 @@ class Cache(object):
 
     def put(self, id, obj):
         if self.enabled:
-            if self.items.has_key(id) and obj is not self.items[id]:
+            if id in self.items and obj is not self.items[id]:
                 #raise ValueError("Item is already cached: %d (%s, %s)" %
                 #        (id, self.items[id], obj))
                 warn(Config.w_cached, "Item is already cached: %d (%s, %s)" % \
@@ -148,7 +148,7 @@ class Cache(object):
 
     def replace(self, id, obj):
         if self.enabled:
-            assert self.items.has_key(id)
+            assert id in self.items
             self.items[id] = obj
 
 class ListDiff(object):
@@ -226,7 +226,7 @@ class VersionMap(object):
         self.symbols = {}
 
     def append(self, symbol):
-        if (self.symbols.has_key(symbol.name)):
+        if (symbol.name in self.symbols):
             raise ValueError("Symbol is already defined %s@%s" %
                     (symbol.name, self.name))
         self.symbols[symbol.name] = symbol
@@ -250,7 +250,7 @@ class Def(object):
         self.attrs = kwargs
 
     def __getattr__(self, attr):
-        if not self.attrs.has_key(attr):
+        if attr not in self.attrs:
             raise AttributeError('%s in %s' % (attr, str(self)))
         return self.attrs[attr]
 
@@ -645,7 +645,7 @@ class Shlib(object):
             if not Config.symbol_filter.match(p['symbol']):
                 continue
             sym = Symbol(p['symbol'], p['offset'], vername, self)
-            if not self.versions.has_key(vername):
+            if vername not in self.versions:
                 self.versions[vername] = VersionMap(vername)
             self.versions[vername].append(sym)
         if Config.alias_prefixes:
@@ -655,7 +655,7 @@ class Shlib(object):
                     if not p['symbol'].startswith(prefix):
                         continue
                     alias = SymbolAlias(p['symbol'], prefix, p['offset'])
-                    if self.alias_syms.has_key(alias.name):
+                    if alias.name in self.alias_syms:
                         prevalias = self.alias_syms[alias.name]
                         if alias.name != prevalias.name or \
                                 alias.offset != prevalias.offset:
@@ -676,7 +676,7 @@ class Shlib(object):
                     localnames = self.local_offsetmap[sym.offset]
                     localnames.sort(key=lambda x: -len(x))
                     for localname in localnames:
-                        if not self.alias_syms.has_key(localname):
+                        if localname not in self.alias_syms:
                             continue
                         alias = self.alias_syms[localname]
                         raw = dwarfdump.offsetmap[alias.offset]
@@ -753,7 +753,7 @@ class ObjdumpParser(Parser):
             return
         table.append(symbol)
         if offsetmap != None:
-            if not offsetmap.has_key(offset):
+            if offset not in offsetmap:
                 offsetmap[offset] = [symbol['symbol']]
             else:
                 offsetmap[offset].append(symbol['symbol'])
@@ -921,9 +921,9 @@ class DwarfdumpParser(Parser):
             args = self.parse_arg(tag, args)
         tag.unit.tags[tag.id] = tag
         def parse_offset(tag):
-            if tag.args.has_key('DW_AT_low_pc'):
+            if 'DW_AT_low_pc' in tag.args:
                 return int(tag.args['DW_AT_low_pc'], 16)
-            elif tag.args.has_key('DW_AT_location'):
+            elif 'DW_AT_location' in tag.args:
                 location = tag.args['DW_AT_location']
                 if location.startswith('DW_OP_addr'):
                     return int(location.replace('DW_OP_addr', ''), 16)
@@ -931,9 +931,9 @@ class DwarfdumpParser(Parser):
         offset = parse_offset(tag)
         if offset is not None and \
                 (tag.tag not in DwarfdumpParser.skip_tags or \
-                (tag.args.has_key('DW_AT_external') and \
+                ('DW_AT_external' in tag.args and \
                 tag.tag in DwarfdumpParser.external_tags)):
-            if self.offsetmap.has_key(offset):
+            if offset in self.offsetmap:
                 raise ValueError("Dwarf dump parse error: " +
                         "symbol is aleady defined at offset 0x%x" % offset)
             self.offsetmap[offset] = tag