diff options
author | Robey Pointer <robey@src.gnome.org> | 2000-11-07 13:50:00 +0000 |
---|---|---|
committer | Robey Pointer <robey@src.gnome.org> | 2000-11-07 13:50:00 +0000 |
commit | ac42b0e902d3deb79994c83dd1fa3429d6096915 (patch) | |
tree | d4f148ffd6b4eda6ae44a3ef95ddce8628dc4fd6 /nautilus-installer/src/prescript | |
parent | 047926b9ccfdfc5a5dcf9d08ff4265ebbcd3c169 (diff) | |
download | nautilus-ac42b0e902d3deb79994c83dd1fa3429d6096915.tar.gz |
Backport bug 4594's fix to head: skip checking breakage on packages we're
* components/services/install/lib/eazel-install-rpm-glue.c:
(eazel_install_rpm_create_requirement),
(eazel_install_do_rpm_dependency_check):
* components/services/install/lib/eazel-install-types.c:
(eazel_install_requirement_dep_name_compare):
* components/services/install/lib/eazel-install-types.h:
Backport bug 4594's fix to head: skip checking breakage on
packages we're about to install/upgrade.
* nautilus-installer/src/prescript:
Revert Josh's well-meaning but incorrect patch to the spelling of
Gnome in the Nautilus PR1 version test.
Diffstat (limited to 'nautilus-installer/src/prescript')
-rw-r--r-- | nautilus-installer/src/prescript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript index dba26d2f0..556ac0d0a 100644 --- a/nautilus-installer/src/prescript +++ b/nautilus-installer/src/prescript @@ -13,7 +13,7 @@ fi PR1_TO_PR2=no if [ -f /usr/bin/nautilus ]; then VERSION=`/usr/bin/nautilus --version` - if [ "x$VERSION" = "xGNOME nautilus 0.1.0" ]; then + if [ "x$VERSION" = "xGnome nautilus 0.1.0" ]; then PR1_TO_PR2=yes fi fi |