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

Also allow source packages in a repository for any architecture

Browse Source
This commit is contained in:
Ingo Weinhold
2013-07-04 12:13:21 +02:00
parent 2f5551ec2a
commit fd28164da0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/hpkg/RepositoryWriterImpl.cpp
+5 -4
View File
@@ -376,14 +376,15 @@ RepositoryWriterImpl::_RegisterCurrentPackageInfo()
// used by the repository // used by the repository
BPackageArchitecture expectedArchitecture = fRepositoryInfo->Architecture(); BPackageArchitecture expectedArchitecture = fRepositoryInfo->Architecture();
if (fPackageInfo.Architecture() != expectedArchitecture if (fPackageInfo.Architecture() != expectedArchitecture
&& fPackageInfo.Architecture() != B_PACKAGE_ARCHITECTURE_ANY) { && fPackageInfo.Architecture() != B_PACKAGE_ARCHITECTURE_ANY
&& fPackageInfo.Architecture() != B_PACKAGE_ARCHITECTURE_SOURCE) {
fListener->PrintError( fListener->PrintError(
"package '%s' has non-matching architecture '%s' " "package '%s' has non-matching architecture '%s' "
"(expected '%s' or '%s')!\n", fPackageInfo.Name().String(), "(expected '%s', '%s', or '%s')!\n", fPackageInfo.Name().String(),
BPackageInfo::kArchitectureNames[fPackageInfo.Architecture()], BPackageInfo::kArchitectureNames[fPackageInfo.Architecture()],
BPackageInfo::kArchitectureNames[expectedArchitecture], BPackageInfo::kArchitectureNames[expectedArchitecture],
BPackageInfo::kArchitectureNames[B_PACKAGE_ARCHITECTURE_ANY] BPackageInfo::kArchitectureNames[B_PACKAGE_ARCHITECTURE_ANY],
); BPackageInfo::kArchitectureNames[B_PACKAGE_ARCHITECTURE_SOURCE]);
return B_BAD_DATA; return B_BAD_DATA;
} }