Attachment 151698 Details for Bug 234893 – cvs diff installer.cc (removing LD_LIBRARY_PATH notice)

[patch] cvs diff installer.cc (removing LD_LIBRARY_PATH notice)

installer.cc.diff (text/plain), 3.99 KB, created by Noriko Hosoi on 2007-04-04 19:01:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-04-04 19:01:02 UTC

Size: 3.99 KB

patch

obsolete

>Index: installer/unix/installer.cc
>===================================================================
>RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 installer.cc
>--- installer/unix/installer.cc	27 Mar 2006 21:18:35 -0000	1.5
>+++ installer/unix/installer.cc	4 Apr 2007 18:52:15 -0000
>@@ -791,12 +791,32 @@
>    filename = _newSuiteSpot.get("resource");
> 
>    if (filename)
>    {
>-      NSString resourceFile;
>+      NSString resourceFile = NULL;
>+      if ('/' == *filename) /* absolute path */
>+      {
>+         resourceFile = filename;
>+      }
>+      else
>+      {
>       resourceFile = _baseDir + "/" + filename;
>+         if (InstUtil::fileExists(resourceFile) == False)
>+         {
>+            /* the file is not in _baseDir (where dssetup is located) */
>+            resourceFile = NSString(PROPERTYDIR) + "/" + filename;
>+         }
>+      }
>+      if (InstUtil::fileExists(resourceFile) == False)
>+      {
>+         setupLogMessage(WARN, "Setup",
>+                         "Resource file %s does not exist.\n", resourceFile);
>+      }
>+      else
>+      {
>       customResource.read(resourceFile);
>    }
>+   }
> 
>    // Even without resource file defined, we still want to
>    // customize product and vendor name 
>    if (p = _newSuiteSpot.get(SETUP_INF_VENDOR))
>@@ -928,10 +948,8 @@
> 
>    /*
>     * Start the first stage - common installer's questions
>     */
>-   
>-   printNotice();
>    prepreInstall();
> 
>    if (_installMode == Silent)
>    {
>@@ -1429,22 +1447,34 @@
> Installer::getNewProducts(const NSString & sourceDir, const char *infName)
> {
>   NSString infFile;
> 
>+  if ('/' == *infName) /* absolute path */
>+  {
>+    infFile = infName;
>+  }
>+  else
>+  {
>   infFile = sourceDir + "/";
>   infFile = infFile + infName;
> 
>   if (InstUtil::fileExists(infFile) == False)
>   {
>-     return -1;
>+      /* the file is not in sourceDir, try PROPERTYDIR */
>+      infFile = NSString(PROPERTYDIR) + "/" + infName;
>+    }
>+  }
>+  if (InstUtil::fileExists(infFile) == False)
>+  {
>+    return -1; /* infFile does not exist */
>   }
> 
>   if (sourceDir == _sourceDir && _newSuiteSpot.numComponents())
>   {
>      return 0;
>   }
> 
>-  if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infName) == 0 && _newSuiteSpot.numComponents())
>+  if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infFile) == 0 && _newSuiteSpot.numComponents())
>   {
>      _newSuiteSpot.getComponents()->sortComponents();
>      _newSuiteSpot.select();
>      _newSuiteSpot.getAllComponents(*_newComponents); // Flatten the structure
>@@ -3288,51 +3318,4 @@
> Installer::needDomainName()
> {
>   return _checkDomainName;
> }
>-
>-
>-
>-void
>-Installer::printNotice()
>-{
>-   /* Bug 408242: Check if the LD_LIBRARY_PATH/SHLIB_PATH is set.
>-    * If so, display a warning. Also, unset ENV variable.
>-    */
>-
>-    char *lib_name = NULL, *lib_path = NULL, tmp[XSM_BUF], *env_path = NULL;
>-
>-#if defined (HPUX)
>-    lib_name = strdup("SHLIB_PATH");
>-#else
>-    lib_name = strdup("LD_LIBRARY_PATH");
>-#endif
>-
>-    memset(tmp, '\0', XSM_BUF);
>-    if (lib_path = getenv(lib_name))
>-    {
>-        DialogManager::disableWinMode();
>-        printf("\n%s %s %s\n\n", "Notice: Your", lib_name, "variable is set to:");
>-        printf("\t%s\n\n", lib_path);
>-        printf("%s %s %s\n", "Please unset", lib_name, "or verify that the");
>-        printf("%s\n", "above setting is correct before continuing with");
>-        printf("%s\n", "the installation. An incorrect setting may cause");
>-        printf("%s\n", "problems during the installation such as the wrong");
>-        printf("%s\n\n", "copy of a shared library being used.");
>-        if (_installMode != Silent) 
>-        {
>-            printf("%s", "Continue [n]? ");
>-            fflush(stdout);
>-            fgets(tmp, sizeof(tmp), stdin);
>-            if (tmp[0] == 'n' || tmp[0] == 'N' || tmp[0] == '\0' || (tmp[0] < 0x20))
>-            {
>-                free(lib_name);
>-                exit(0);
>-            }
>-        }
>-    }
>-
>-    free(lib_name);
>-
>-    env_path = strdup("ENV=");
>-    putenv(env_path);
>-}

Actions: View | Diff

Attachments on bug 234893: 151466 | 151468 | 151469 | 151604 | 151605 | 151637 | 151638 | 151698 | 151722 | 151725 | 151728 | 151793 | 151794