emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 afc7ed987b: Allow be-resources to fail


From: Po Lu
Subject: emacs-29 afc7ed987b: Allow be-resources to fail
Date: Tue, 29 Nov 2022 01:26:26 -0500 (EST)

branch: emacs-29
commit afc7ed987b1c76f6c1f7324fa8eb7692aa8373d3
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Allow be-resources to fail
    
    * lib-src/be_resources.cc (be_perror): Print additional blurb.
    (main): Return 0 on failure as well, but print the blurb.
    Problem reported by the Haiku packager.
---
 lib-src/be_resources.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib-src/be_resources.cc b/lib-src/be_resources.cc
index 414f91a192..ece573a85a 100644
--- a/lib-src/be_resources.cc
+++ b/lib-src/be_resources.cc
@@ -71,9 +71,11 @@ be_perror (status_t code, char *arg)
        }
     }
   else
-    {
-      abort ();
-    }
+    abort ();
+
+  fprintf (stderr, "Setting resources failed on the `src/Emacs' binary.\n"
+          "This may result in the installed `Emacs' binary not launching\n"
+          " from the tracker, but is inconsequential during packaging.\n");
 }
 
 int
@@ -111,19 +113,19 @@ main (int argc, char **argv)
   if (code != B_OK)
     {
       be_perror (code, argv[2]);
-      return EXIT_FAILURE;
+      return 0;
     }
   code = info.SetTo (&file);
   if (code != B_OK)
     {
       be_perror (code, argv[2]);
-      return EXIT_FAILURE;
+      return 0;
     }
   code = info.SetAppFlags (B_EXCLUSIVE_LAUNCH | B_ARGV_ONLY);
   if (code != B_OK)
     {
       be_perror (code, argv[2]);
-      return EXIT_FAILURE;
+      return 0;
     }
 
   icon = BTranslationUtils::GetBitmapFile (argv[1], NULL);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]