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

Now sets the "other" unchanged version info to {0} if it doesn't exist yet - this

Browse Source 
should work around bug #681 on R5. Please test.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20076 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-02-05 23:28:09 +00:00
parent c282eba324
commit 8c31a369ab
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/setversion.cpp
+13 -1
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2002, Ryan Fleet. * Copyright 2002, Ryan Fleet.
* Copyright 2006, Axel Dörfler, [email protected]. * Copyright 2006-2007, Axel Dörfler, [email protected].
* *
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
*/ */
@@ -332,6 +332,18 @@ main(int argc, char *argv[])
if (status != B_OK) if (status != B_OK)
errorOut(status, argv[1], false); errorOut(status, argv[1], false);
if (systemModified ^ appModified) {
// clear out other app info if not present - this works around a
// bug in BeOS, see bug #681.
version_kind kind = systemModified ? B_APP_VERSION_KIND : B_SYSTEM_VERSION_KIND;
version_info clean;
if (info.GetVersionInfo(&clean, kind) != B_OK) {
memset(&clean, 0, sizeof(version_info));
info.SetVersionInfo(&clean, kind);
}
}
if (appModified) { if (appModified) {
status = info.SetVersionInfo(&appVersion, B_APP_VERSION_KIND); status = info.SetVersionInfo(&appVersion, B_APP_VERSION_KIND);
if (status < B_OK) if (status < B_OK)