minor merges

* translation update path
* pkgorder fix
* ja font fix

3 files changed, 14 insertions, 3 deletions

diff --git a/anaconda b/anaconda
index 8c682b535..c3eae7d08 100755
--- a/anaconda
+++ b/anaconda
@@ -298,8 +298,14 @@ from flags import flags
 from anaconda_log import anaconda_log
 
 from rhpl.log import log
-from rhpl.translate import _, textdomain
-
+from rhpl.translate import _, textdomain, addPoPath
+
+if os.path.isdir("/mnt/source/RHupdates/po"):
+    log("adding RHupdates/po")
+    addPoPath("/mnt/source/RHupdates/po")
+if os.path.isdir("/tmp/updates/po"):
+    log("adding /tmp/updates/po")    
+    addPoPath("/tmp/updates/po")
 textdomain("anaconda")
 
 # reset python's default SIGINT handler
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 658b79b63..711c8dced 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -88,7 +88,12 @@ def runTsAndOutput(pkglist):
     ts.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA))
     ts.setFlags(rpm.RPMTRANS_FLAG_ANACONDA)
 
+    done = []
     for item in pkglist:
+        # make sure we don't double add package names
+        if item.hdr['name'] in done:
+            continue
+        done.append(item.hdr['name'])
 #        print >> sys.stderr, "adding %s" %(item.name,)
         ts.addInstall(item.hdr, item.hdr, "i")
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index cc5edd529..1f925dc24 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -601,7 +601,7 @@ usr/share/fonts/default/Type1/n021004l*
 usr/share/fonts/default/Type1/n021023l*
 usr/share/fonts/default/Type1/n021024l*
 usr/share/fonts/ko/TrueType/dotum.ttf
-usr/share/fonts/ja/TrueType/kochi-gothic.ttf
+usr/share/fonts/ja/TrueType/kochi-gothic-subst.ttf
 usr/share/fonts/zh_TW/TrueType/bsmi00lp.ttf
 usr/share/locale/*/LC_MESSAGES/anaconda.mo
 usr/share/locale/*/LC_MESSAGES/redhat-dist.mo