diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-08 05:19:11 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-08 05:19:11 +0000 |
| commit | d5cd11fd93f98f60462d933dc02a7844e4a0a7da (patch) | |
| tree | 9693829861022a1d65e725e29d6ce1342c4915a7 /scripts | |
| parent | 4f2c13ae1b31389579212c15049bb1e054caa9bb (diff) | |
minor merges
* translation update path
* pkgorder fix
* ja font fix
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/pkgorder | 5 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 2 |
2 files changed, 6 insertions, 1 deletions
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 |