diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-10-28 16:03:30 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-10-28 16:03:30 +0000 |
| commit | a177e36e04dc36350c20a524275b3e184ee4dc63 (patch) | |
| tree | 5f1302df021c99517a88d8d3d8a3c7c3e1483b4b | |
| parent | 1cdd06f464c847b0a71fd20b0f854e7da63f7b99 (diff) | |
| download | anaconda-10.1.0.2-1.tar.gz anaconda-10.1.0.2-1.tar.xz anaconda-10.1.0.2-1.zip | |
2004-10-28 Jeremy Katz <katzj@redhat.com>anaconda-10.1.0.2-1
* anaconda.spec: Bump version.
* upgrade.py (upgradeFindPackages): Firefox on upgrade (#137244)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | anaconda.spec | 6 | ||||
| -rw-r--r-- | upgrade.py | 13 |
3 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2004-10-28 Jeremy Katz <katzj@redhat.com> + + * anaconda.spec: Bump version. + + * upgrade.py (upgradeFindPackages): Firefox on upgrade (#137244) + 2004-10-27 Jeremy Katz <katzj@redhat.com> * anaconda.spec: Bump version. diff --git a/anaconda.spec b/anaconda.spec index 14ac3933c..de2c3669a 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ ExcludeArch: ppc64 Name: anaconda -Version: 10.1.0.1 +Version: 10.1.0.2 Release: 1 License: GPL Summary: Graphical system installer @@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Oct 28 2004 Jeremy Katz <katzj@redhat.com> - 10.1.0.2-1 +- Bring in firefox on upgrade if mozilla/netscape were + previously installed (#137244) + * Wed Oct 27 2004 Jeremy Katz <katzj@redhat.com> - 10.1.0.1-1 - Punjabi shouldn't try to do text mode (#137030) - Fix traceback on upgrade (#137345) diff --git a/upgrade.py b/upgrade.py index f717599e3..68376146a 100644 --- a/upgrade.py +++ b/upgrade.py @@ -716,6 +716,19 @@ def upgradeFindPackages(intf, method, id, instPath, dir): log(text) id.grpset.hdrlist[new].select() + # firefox replaces mozilla/netscape (#137244) + if (id.grpset.hdrlist.has_key("firefox") and + not id.grpset.hdrlist["firefox"].isSelected()): + found = 0 + for p in ("mozilla", "netscape-navigator", "netscape-communicator"): + mi = ts.dbMatch("name", p) + found += mi.count() + if found > 0: + text = "Upgrade: Found a graphical browser. Pulling in firefox" + id.upgradeDeps = "%s%s\n" %(id.upgradeDeps, text) + log(text) + id.grpset.hdrlist["firefox"].select() + # now some upgrade removal black list checking... there are things that # if they were installed in the past, we want to remove them because # they'll screw up the upgrade otherwise |