Simplify uninstall-only warning

Simplify uninstall-only warning when running in 'Install from Local
Directory' mode with a non-existent package directory.

Strictly, this is wrong as written, since is_64 reflects the --arch
option setting, not the arch of the executable.

In any case, mentioning the executable name seems to just distract from
the warning we are trying to deliver here.

diff --git a/localdir.cc b/localdir.cc
index 0561a3053456f38dfac80ab1f21198ea4d905064..fd49634d5a8208b071ac2058040beae074dc0483 100644 (file)
--- a/localdir.cc
+++ b/localdir.cc
@@ -284,8 +284,7 @@ LocalDirPage::OnNext ()
              LoadString (hinstance, IDS_NO_LOCALDIR, msgText,
                          sizeof (msgText));
              char msg[1000 + local_dir.size ()];
-             snprintf (msg, sizeof (msg), msgText, local_dir.c_str (),
-                       is_64bit ? "x86_64" : "x86");
+             snprintf (msg, sizeof (msg), msgText, local_dir.c_str ());
              int ret = MessageBox (h, msg, 0, MB_ICONEXCLAMATION | MB_OKCANCEL);
              if (ret == IDCANCEL)
                 return -1;

diff --git a/res.rc b/res.rc
index 8739278d2e82441dfc4215911834d91f28a616c6..1e0fd8584a1062dd753250f8daf26982bb0c0771 100644 (file)
--- a/res.rc
+++ b/res.rc
@@ -602,7 +602,7 @@ BEGIN
        "downloaded installation files."
     IDS_MAYBE_MKDIR    "Directory %s does not exist, would you like me to create it?"
     IDS_CANT_MKDIR     "Couldn't create directory %s, sorry.  (Is drive full or read-only?)"
-    IDS_NO_LOCALDIR    "Local package directory %s not found.\nYou can still use setup-%s.exe to remove installed\npackages, but there "
+    IDS_NO_LOCALDIR    "Local package directory %s not found.\nYou can still remove installed\npackages, but there "
       "will be nothing to install.\n\nPress OK if that's what you wanted\nor Cancel to choose a different directory."
     IDS_ELEVATED       "Hand installation over to elevated child process."
     IDS_INSTALLEDB_VERSION "Unknown INSTALLED.DB version"