aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/pkg/files
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2017-12-05 16:22:01 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2017-12-05 16:22:01 +0000
commitbfd7582edde789ab6cac0bbf6456fe275c5a9344 (patch)
tree4101fdd0de92441a4883c54d46e129190c318b15 /ports-mgmt/pkg/files
parentbcf265d0e17ec232a2d54f24d7801f79ae788a58 (diff)
downloadports-bfd7582edde789ab6cac0bbf6456fe275c5a9344.tar.gz
ports-bfd7582edde789ab6cac0bbf6456fe275c5a9344.zip
Notes
Diffstat (limited to 'ports-mgmt/pkg/files')
-rw-r--r--ports-mgmt/pkg/files/patch-src_version.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/ports-mgmt/pkg/files/patch-src_version.c b/ports-mgmt/pkg/files/patch-src_version.c
new file mode 100644
index 000000000000..714e66a63917
--- /dev/null
+++ b/ports-mgmt/pkg/files/patch-src_version.c
@@ -0,0 +1,28 @@
+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) {