From 602076ef82647a48fd10f4d1ec830bb4242f9eb6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 7 Dec 2016 21:27:18 -0600 Subject: [PATCH] repo rework: Remove stubs; Breaks repo compat. * These stubbs satisfied older Haiku releases that required the URL * Users running nightly images will need to upgrade to hrev50723 - hrev50744 before upgrading further * Getting this out of the way now before the beta comes out. * New installations shouldn't suffer any problems. --- headers/os/package/RepositoryInfo.h | 3 --- src/kits/package/RepositoryInfo.cpp | 7 ------- 2 files changed, 10 deletions(-) diff --git a/headers/os/package/RepositoryInfo.h b/headers/os/package/RepositoryInfo.h index 513539c18b..c94872419b 100644 --- a/headers/os/package/RepositoryInfo.h +++ b/headers/os/package/RepositoryInfo.h @@ -55,9 +55,6 @@ public: static const uint8 kDefaultPriority; - // XXX: Kill me after everyone upgrades - static const char* const kURLField; - static const char* const kNameField; static const char* const kVendorField; static const char* const kSummaryField; diff --git a/src/kits/package/RepositoryInfo.cpp b/src/kits/package/RepositoryInfo.cpp index 46828540ab..3a673c87cf 100644 --- a/src/kits/package/RepositoryInfo.cpp +++ b/src/kits/package/RepositoryInfo.cpp @@ -35,9 +35,6 @@ const char* const BRepositoryInfo::kArchitectureField = "architecture"; const char* const BRepositoryInfo::kLicenseNameField = "licenseName"; const char* const BRepositoryInfo::kLicenseTextField = "licenseText"; -// XXX: Kill me after everyone upgrades. -const char* const BRepositoryInfo::kURLField = "url"; - BRepositoryInfo::BRepositoryInfo() : @@ -85,10 +82,6 @@ BRepositoryInfo::Archive(BMessage* data, bool deep) const if (result != B_OK) return result; - // XXX: Kill me after everyone upgrades - if ((result = data->AddString(kURLField, "STUB")) != B_OK) - return result; - if ((result = data->AddString(kNameField, fName)) != B_OK) return result; if ((result = data->AddString(kVendorField, fVendor)) != B_OK)