1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

Update to 1.10.4

- Fix progression display
- Parse FreeBSD OS version and forbid to install too new packages
This commit is contained in:
Baptiste Daroussin 2018-01-06 23:50:22 +00:00
parent ed2b8cb729
commit 39150e2743
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458302
3 changed files with 4 additions and 33 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
DISTVERSION= 1.10.3
PORTREVISION= 1
DISTVERSION= 1.10.4
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
MASTER_SITES= \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1512423062
SHA256 (pkg-1.10.3.tar.xz) = a5db61522eccc91538b0ac19da56ddbe8eaf8c3bd94868a1753c37c8bade7715
SIZE (pkg-1.10.3.tar.xz) = 2188196
TIMESTAMP = 1515282421
SHA256 (pkg-1.10.4.tar.xz) = 10f767ba6b2e257fef6f1553f74b8602b6fba9de382ee8f2bb6966bcc03696fa
SIZE (pkg-1.10.4.tar.xz) = 2184588

View File

@ -1,28 +0,0 @@
diff --git src/version.c src/version.c
index d265776b..92c18060 100644
--- src/version.c
+++ src/version.c
@@ -601,6 +601,8 @@ exec_buf(UT_string *res, char **argv) {
if (errno != EINTR)
return (-1);
}
+ if (WEXITSTATUS(pstat) != 0)
+ return (-1);
return (utstring_len(res));
}
@@ -716,11 +718,13 @@ port_version(UT_string *cmd, const char *portsdir, const char *origin,
argv[3] = "flavors-package-names";
argv[4] = NULL;
- if (exec_buf(cmd, argv) != 0) {
+ if (exec_buf(cmd, argv) > 0) {
output = utstring_body(cmd);
while ((walk = strsep(&output, "\n")) != NULL) {
name = walk;
walk = strrchr(walk, '-');
+ if (walk == NULL)
+ continue;
walk[0] = '\0';
walk++;
if (strcmp(name, pkgname) == 0) {