mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-13 18:27:35 +00:00
Bug 574183 - Fix bustage.
This commit is contained in:
parent
76adb57895
commit
b3613bee53
@ -51,7 +51,7 @@ VISIBILITY_FLAGS =
|
||||
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
||||
|
||||
ifeq (WINNT,$(HOST_OS_ARCH))
|
||||
HOST_CSRCS = nsinstall_win.c
|
||||
HOST_CSRCS = nsinstall_win.c
|
||||
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
|
||||
else
|
||||
HOST_CSRCS = nsinstall.c pathsub.c
|
||||
|
@ -51,7 +51,8 @@ VISIBILITY_FLAGS =
|
||||
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
||||
|
||||
ifeq (WINNT,$(HOST_OS_ARCH))
|
||||
HOST_CSRCS = nsinstall_win.c
|
||||
HOST_CSRCS = nsinstall_win.c
|
||||
HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
|
||||
else
|
||||
HOST_CSRCS = nsinstall.c pathsub.c
|
||||
endif
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include <windows.h>
|
||||
#include <shlwapi.h>
|
||||
#pragma hdrstop
|
||||
|
||||
/*
|
||||
@ -332,6 +333,8 @@ sh_DoCopy(wchar_t *srcFileName,
|
||||
}
|
||||
|
||||
if (!CopyFile(longSrc, longDst, FALSE)) {
|
||||
if (!wcscmp(PathFindExtension(longSrc), L".chk"))
|
||||
return TRUE; // Incredibly ugly hack to work around Bug 539689
|
||||
fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
|
||||
srcFileName, dstFileName, sh_GetLastErrorMessage());
|
||||
return FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user