From b50e5e330702837e70cb1a1ef04d37aacf327fa3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 19 Apr 2013 01:31:47 +0200 Subject: [PATCH] package[_repo]: Print version correctly Use BPackageVersion::ToString() instead of assembling the version string manually. This fixes the incorrect pre-release separator. --- src/bin/package/command_list.cpp | 10 +--------- src/bin/package_repo/command_list.cpp | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/bin/package/command_list.cpp b/src/bin/package/command_list.cpp index 63569b16a0..3c0909c751 100644 --- a/src/bin/package/command_list.cpp +++ b/src/bin/package/command_list.cpp @@ -265,15 +265,7 @@ private: static void _PrintPackageVersion(const BPackageVersionData& version) { - printf("%s", version.major); - if (version.minor != NULL && version.minor[0] != '\0') - printf(".%s", version.minor); - if (version.micro != NULL && version.micro[0] != '\0') - printf(".%s", version.micro); - if (version.preRelease != NULL && version.preRelease[0] != '\0') - printf("-%s", version.preRelease); - if (version.revision > 0) - printf("-%" B_PRIu32, version.revision); + printf("%s", BPackageVersion(version).ToString().String()); } private: diff --git a/src/bin/package_repo/command_list.cpp b/src/bin/package_repo/command_list.cpp index 38d2842722..9faa532a8b 100644 --- a/src/bin/package_repo/command_list.cpp +++ b/src/bin/package_repo/command_list.cpp @@ -231,15 +231,7 @@ struct RepositoryContentListHandler : BRepositoryContentHandler { private: static void _PrintPackageVersion(const BPackageVersionData& version) { - printf("%s", version.major); - if (version.minor != NULL && version.minor[0] != '\0') - printf(".%s", version.minor); - if (version.micro != NULL && version.micro[0] != '\0') - printf(".%s", version.micro); - if (version.preRelease != NULL && version.preRelease[0] != '\0') - printf("-%s", version.preRelease); - if (version.revision > 0) - printf("-%" B_PRIu32, version.revision); + printf("%s", BPackageVersion(version).ToString().String()); } private: