[haiku-commits] BRANCH HaikuPM-github.package-management - src/bin/package_repo src/bin/package build/jam
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 19 Apr 2013 01:45:31 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: ea8b5c257d37d7dacc221a3535548d03edfa3871
new head: f16dbba4422edc0a409b8e781bbb3608ccd61e45
overview: https://github.com/haiku/HaikuPM/compare/ea8b5c2...f16dbba
----------------------------------------------------------------------------
b50e5e3: package[_repo]: Print version correctly
Use BPackageVersion::ToString() instead of assembling the version
string manually. This fixes the incorrect pre-release separator.
f16dbba: Update libsolv package
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 3 insertions(+), 19 deletions(-)
build/jam/OptionalBuildFeatures | 2 +-
src/bin/package/command_list.cpp | 10 +---------
src/bin/package_repo/command_list.cpp | 10 +---------
############################################################################
Commit: b50e5e330702837e70cb1a1ef04d37aacf327fa3
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Apr 18 23:31:47 2013 UTC
package[_repo]: Print version correctly
Use BPackageVersion::ToString() instead of assembling the version
string manually. This fixes the incorrect pre-release separator.
----------------------------------------------------------------------------
diff --git a/src/bin/package/command_list.cpp b/src/bin/package/command_list.cpp
index 63569b1..3c0909c 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 38d2842..9faa532 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:
############################################################################
Commit: f16dbba4422edc0a409b8e781bbb3608ccd61e45
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Thu Apr 18 23:34:26 2013 UTC
Update libsolv package
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index a3e087d..8cbad21 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -221,7 +221,7 @@ if $(TARGET_ARCH) != x86 {
Echo "Libsolv not available for $(TARGET_ARCH)." ;
} else if $(HAIKU_GCC_VERSION[1]) = 2 {
HAIKU_LIBSOLV_PACKAGE
- = libsolv-0.3.0_haiku_2013_04_15-1-x86_gcc2.hpkg ;
+ = libsolv-0.3.0_haiku_2013_04_18-1-x86_gcc2.hpkg ;
} else {
Echo "Libsolv not available for gcc4." ;
}
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management - src/bin/package_repo src/bin/package build/jam - HaikuPM-github . package-management
