Attachment 140165 Details for Bug 186671 – pkg-1.2.6_r344040.diff

[patch] pkg-1.2.6_r344040.diff

pkg-1.2.6_r344040.diff (text/x-diff; charset=utf-8), 1.63 KB, created by John Marshall on 2014-02-13 06:30:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marshall

Created: 2014-02-13 06:30:32 UTC

Size: 1.63 KB

patch

obsolete

>Index: ports-mgmt/pkg/files/patch-pkg_version.c
>===================================================================
>--- ports-mgmt/pkg/files/patch-pkg_version.c	(revision 0)
>+++ ports-mgmt/pkg/files/patch-pkg_version.c	(working copy)
>@@ -0,0 +1,28 @@
>+--- pkg/version.c.orig	2014-02-02 05:33:30.000000000 +1100
>++++ pkg/version.c	2014-02-13 15:34:07.000000000 +1100
>+@@ -318,7 +318,7 @@
>+ 				opt |= VERSION_SOURCE_REMOTE;
>+ 		}
>+ 
>+-		if (!have_ports && (opt & (VERSION_SOURCE_INDEX|VERSION_SOURCE_PORTS)))
>++		if (!have_ports && (opt & VERSION_SOURCE_PORTS))
>+ 			err(1, "Unable to open ports directory %s", portsdir);
>+ 
>+ 		/* Only force remote mode if looking up remote, otherwise
>+@@ -341,9 +341,13 @@
>+ 			goto cleanup;
>+ 
>+ 		if (opt & VERSION_SOURCE_INDEX) {
>+-			uname(&u);
>+-			rel_major_ver = (int) strtol(u.release, NULL, 10);
>+-			snprintf(indexpath, sizeof(indexpath), "%s/INDEX-%d", portsdir, rel_major_ver);
>++			if (argc == 1) {
>++				snprintf(indexpath, sizeof(indexpath), "%s", argv[0]);
>++			} else {
>++				uname(&u);
>++				rel_major_ver = (int) strtol(u.release, NULL, 10);
>++				snprintf(indexpath, sizeof(indexpath), "%s/INDEX-%d", portsdir, rel_major_ver);
>++			}
>+ 			indexfile = fopen(indexpath, "r");
>+ 			if (!indexfile)
>+ 				err(EX_SOFTWARE, "Unable to open %s!", indexpath);
>
>Property changes on: ports-mgmt/pkg/files/patch-pkg_version.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 186671: 140165 | 140166 | 140167