Date: Tue, 26 Nov 2013 17:39:40 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334957 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files Message-ID: <201311261739.rAQHdeVS066632@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 26 17:39:40 2013 New Revision: 334957 URL: http://svnweb.freebsd.org/changeset/ports/334957 Log: First errata: - Fix pkg rquery always printing index like lines [1] - Fix pkg -vv suggestion so it print something actually usable [2] Reported by: gjb [1] Reported by: ohauer [2] Added: head/ports-mgmt/pkg-devel/files/ head/ports-mgmt/pkg-devel/files/patch-errata1 (contents, props changed) head/ports-mgmt/pkg/files/ head/ports-mgmt/pkg/files/patch-errata1 (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Tue Nov 26 17:39:34 2013 (r334956) +++ head/ports-mgmt/pkg-devel/Makefile Tue Nov 26 17:39:40 2013 (r334957) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg-devel/files/patch-errata1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-errata1 Tue Nov 26 17:39:40 2013 (r334957) @@ -0,0 +1,62 @@ +diff --git COPYING COPYING +index a8adb39..d6bd4e1 100644 +--- COPYING ++++ COPYING +@@ -1,6 +1,6 @@ + See the AUTHORS file to get the list of authors + +-Copyright (c) 2010-2012 <author(s)> ++Copyright (c) 2010-2013 <author(s)> + All rights reserved. + + Redistribution and use in source and binary forms, with or without +diff --git pkg/main.c pkg/main.c +index c562ac8..ec382c5 100644 +--- pkg/main.c ++++ pkg/main.c +@@ -442,17 +442,23 @@ show_repository_info(void) + break; + } + +- printf(" %s: { \n %-16s: %s,\n %-16s: %s,\n %-16s: %s,\n" +- " %-16s: %s,\n %-16s: %s,\n %-16s: %s\n } \n", ++ printf(" %s: { \n %-16s: \"%s\",\n %-16s: %s", + pkg_repo_ident(repo), + "url", pkg_repo_url(repo), +- "signature_type", sig, +- "pubkey", pkg_repo_key(repo) == NULL ? +- "" : pkg_repo_key(repo), +- "fingerprints", pkg_repo_fingerprints(repo) == NULL ? +- "" : pkg_repo_fingerprints(repo), +- "enabled", pkg_repo_enabled(repo) ? "yes" : "no", +- "mirror_type", mirror); ++ "enabled", pkg_repo_enabled(repo) ? "yes" : "no"); ++ if (pkg_repo_mirror_type(repo) != NOMIRROR) ++ printf(",\n %-16s: \"%s\"", ++ "mirror_type", mirror); ++ if (pkg_repo_signature_type(repo) != SIG_NONE) ++ printf(",\n %-16s: \"%s\"", ++ "signature_type", sig); ++ if (pkg_repo_fingerprints(repo) != NULL) ++ printf(",\n %-16s: \"%s\"", ++ "fingerprints", pkg_repo_fingerprints(repo)); ++ if (pkg_repo_key(repo) != NULL) ++ printf(",\n %-16s: \"%s\"", ++ "pubkey", pkg_repo_key(repo)); ++ printf("\n }\n"); + } + } + +diff --git pkg/rquery.c pkg/rquery.c +index d4c3868..e97ece5 100644 +--- pkg/rquery.c ++++ pkg/rquery.c +@@ -110,7 +110,7 @@ exec_rquery(int argc, char **argv) + bool auto_update; + bool onematched = false; + bool old_quiet; +- bool index_output = true; ++ bool index_output = false; + + pkg_config_bool(PKG_CONFIG_REPO_AUTOUPDATE, &auto_update); + Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Tue Nov 26 17:39:34 2013 (r334956) +++ head/ports-mgmt/pkg/Makefile Tue Nov 26 17:39:40 2013 (r334957) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg/files/patch-errata1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-errata1 Tue Nov 26 17:39:40 2013 (r334957) @@ -0,0 +1,62 @@ +diff --git COPYING COPYING +index a8adb39..d6bd4e1 100644 +--- COPYING ++++ COPYING +@@ -1,6 +1,6 @@ + See the AUTHORS file to get the list of authors + +-Copyright (c) 2010-2012 <author(s)> ++Copyright (c) 2010-2013 <author(s)> + All rights reserved. + + Redistribution and use in source and binary forms, with or without +diff --git pkg/main.c pkg/main.c +index c562ac8..ec382c5 100644 +--- pkg/main.c ++++ pkg/main.c +@@ -442,17 +442,23 @@ show_repository_info(void) + break; + } + +- printf(" %s: { \n %-16s: %s,\n %-16s: %s,\n %-16s: %s,\n" +- " %-16s: %s,\n %-16s: %s,\n %-16s: %s\n } \n", ++ printf(" %s: { \n %-16s: \"%s\",\n %-16s: %s", + pkg_repo_ident(repo), + "url", pkg_repo_url(repo), +- "signature_type", sig, +- "pubkey", pkg_repo_key(repo) == NULL ? +- "" : pkg_repo_key(repo), +- "fingerprints", pkg_repo_fingerprints(repo) == NULL ? +- "" : pkg_repo_fingerprints(repo), +- "enabled", pkg_repo_enabled(repo) ? "yes" : "no", +- "mirror_type", mirror); ++ "enabled", pkg_repo_enabled(repo) ? "yes" : "no"); ++ if (pkg_repo_mirror_type(repo) != NOMIRROR) ++ printf(",\n %-16s: \"%s\"", ++ "mirror_type", mirror); ++ if (pkg_repo_signature_type(repo) != SIG_NONE) ++ printf(",\n %-16s: \"%s\"", ++ "signature_type", sig); ++ if (pkg_repo_fingerprints(repo) != NULL) ++ printf(",\n %-16s: \"%s\"", ++ "fingerprints", pkg_repo_fingerprints(repo)); ++ if (pkg_repo_key(repo) != NULL) ++ printf(",\n %-16s: \"%s\"", ++ "pubkey", pkg_repo_key(repo)); ++ printf("\n }\n"); + } + } + +diff --git pkg/rquery.c pkg/rquery.c +index d4c3868..e97ece5 100644 +--- pkg/rquery.c ++++ pkg/rquery.c +@@ -110,7 +110,7 @@ exec_rquery(int argc, char **argv) + bool auto_update; + bool onematched = false; + bool old_quiet; +- bool index_output = true; ++ bool index_output = false; + + pkg_config_bool(PKG_CONFIG_REPO_AUTOUPDATE, &auto_update); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311261739.rAQHdeVS066632>