зеркало из https://github.com/mozilla/pjs.git
Bug 74522 locally found .xpi should not override a bundled one r=ssu/sr=mscott/a=asa
This commit is contained in:
Родитель
ac2308b05f
Коммит
8d967116cc
|
@ -862,7 +862,6 @@ RunInstaller()
|
||||||
char szText[256];
|
char szText[256];
|
||||||
char szTempPath[4096];
|
char szTempPath[4096];
|
||||||
char szTmp[MAX_PATH];
|
char szTmp[MAX_PATH];
|
||||||
char szCurrentDirectory[MAX_PATH];
|
|
||||||
char szFilename[MAX_BUF];
|
char szFilename[MAX_BUF];
|
||||||
char szBuf[MAX_BUF];
|
char szBuf[MAX_BUF];
|
||||||
DWORD dwLen;
|
DWORD dwLen;
|
||||||
|
@ -898,12 +897,7 @@ RunInstaller()
|
||||||
lstrcpy(szCmdLine, szSetupFile);
|
lstrcpy(szCmdLine, szSetupFile);
|
||||||
GetModuleFileName(NULL, szBuf, sizeof(szBuf));
|
GetModuleFileName(NULL, szBuf, sizeof(szBuf));
|
||||||
ParsePath(szBuf, szFilename, sizeof(szFilename), PP_FILENAME_ONLY);
|
ParsePath(szBuf, szFilename, sizeof(szFilename), PP_FILENAME_ONLY);
|
||||||
ParsePath(szBuf, szCurrentDirectory, sizeof(szCurrentDirectory), PP_PATH_ONLY);
|
|
||||||
RemoveBackSlash(szCurrentDirectory);
|
|
||||||
GetShortPathName(szCurrentDirectory, szBuf, sizeof(szBuf));
|
|
||||||
|
|
||||||
lstrcat(szCmdLine, " -a ");
|
|
||||||
lstrcat(szCmdLine, szBuf);
|
|
||||||
lstrcat(szCmdLine, " -n ");
|
lstrcat(szCmdLine, " -n ");
|
||||||
lstrcat(szCmdLine, szFilename);
|
lstrcat(szCmdLine, szFilename);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче