i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageWriteImpl: Report error when failing to read .PackageInfo

Browse Source 
Fixes #10228.
This commit is contained in:
Ingo Weinhold
2013-11-21 21:11:07 +01:00
parent 64c8d8c126
commit fc198cc3e4
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/hpkg/PackageWriterImpl.cpp
+13 -1
View File
@@ -503,12 +503,20 @@ PackageWriterImpl::AddEntry(const char* fileName, int fd)
if (strcmp(fileName, B_HPKG_PACKAGE_INFO_FILE_NAME) == 0) { if (strcmp(fileName, B_HPKG_PACKAGE_INFO_FILE_NAME) == 0) {
struct ErrorListener : public BPackageInfo::ParseErrorListener { struct ErrorListener : public BPackageInfo::ParseErrorListener {
ErrorListener(BPackageWriterListener* _listener) ErrorListener(BPackageWriterListener* _listener)
: listener(_listener) {} :
listener(_listener),
errorSeen(false)
{
}
virtual void OnError(const BString& msg, int line, int col) { virtual void OnError(const BString& msg, int line, int col) {
listener->PrintError("Parse error in %s(%d:%d) -> %s\n", listener->PrintError("Parse error in %s(%d:%d) -> %s\n",
B_HPKG_PACKAGE_INFO_FILE_NAME, line, col, msg.String()); B_HPKG_PACKAGE_INFO_FILE_NAME, line, col, msg.String());
errorSeen = true;
} }
BPackageWriterListener* listener; BPackageWriterListener* listener;
bool errorSeen;
} errorListener(fListener); } errorListener(fListener);
if (fd >= 0) { if (fd >= 0) {
@@ -543,6 +551,10 @@ PackageWriterImpl::AddEntry(const char* fileName, int fd)
packageInfoEntry, &errorListener); packageInfoEntry, &errorListener);
if (result != B_OK if (result != B_OK
|| (result = fPackageInfo.InitCheck()) != B_OK) { || (result = fPackageInfo.InitCheck()) != B_OK) {
if (!errorListener.errorSeen) {
fListener->PrintError("Failed to read %s: %s\n",
fileName, strerror(result));
}
return result; return result;
} }
} }