From f1e285968fd1eabf51e54cbc036728eddced8d76 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 10 Jan 2017 14:45:36 +0900 Subject: [PATCH] Imported Upstream version 1.12.24 Change-Id: Icec04873b80c820c189245a1ffcc6c52e7714f21 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- doc/zypper.8 | 6 +++--- doc/zypper.8.txt | 2 +- package/zypper.changes | 6 ++++++ src/Summary.cc | 3 --- src/Zypper.cc | 4 ++-- tests/utils/text_test.cc | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 04effeb..b46bd41 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -34,7 +34,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "12") -SET(VERSION_PATCH "23") +SET(VERSION_PATCH "24") -# LAST RELEASED: 1.12.23 +# LAST RELEASED: 1.12.24 #======= diff --git a/doc/zypper.8 b/doc/zypper.8 index 1974b92..799b85a 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -2,12 +2,12 @@ .\" Title: zypper .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 10/07/2015 +.\" Date: 10/26/2015 .\" Manual: ZYPPER .\" Source: SUSE Linux .\" Language: English .\" -.TH "ZYPPER" "8" "10/07/2015" "SUSE Linux" "ZYPPER" +.TH "ZYPPER" "8" "10/26/2015" "SUSE Linux" "ZYPPER" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1264,7 +1264,7 @@ Matches for search strings may be partial words (default)\&. Matches for search strings may only be whole words\&. .RE .PP -\fB\-\-match\-exact\fR +\fB\-x\fR, \fB\-\-match\-exact\fR .RS 4 Searches for an exact name of the package\&. .RE diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt index 9d47631..b4a4eaf 100644 --- a/doc/zypper.8.txt +++ b/doc/zypper.8.txt @@ -674,7 +674,7 @@ Query Commands *--match-words*:: Matches for search strings may only be whole words. - *--match-exact*:: + *-x*, *--match-exact*:: Searches for an exact name of the package. *--provides*:: diff --git a/package/zypper.changes b/package/zypper.changes index 38b04f7..3a4a15f 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 26 12:29:07 CET 2015 - ma@suse.de + +- Add -x shorthand for --match-exact (fixes #64) +- version 1.12.24 + +------------------------------------------------------------------- Thu Oct 22 12:24:00 CEST 2015 - ma@suse.de - Use a uniform translation set for SLE and openSUSE (bnc#948924) diff --git a/src/Summary.cc b/src/Summary.cc index 0f69183..b1f48fa 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -1212,9 +1212,6 @@ void Summary::writeLocked(std::ostream & out) // translators: used as 'tag:' (i.e. followed by ':') out << " " << _("Available") << ':' << endl; wroteAll &= writeResolvableList( out, avidents, ColorContext::HIGHLIGHT, 100, /*withKind*/true ); - - // translators: %1% is a zypper command line - N_("Run '%1%' to see the complete list of locked items."); } if ( ! instlocks.empty() ) { diff --git a/src/Zypper.cc b/src/Zypper.cc index 84c9395..edc1058 100644 --- a/src/Zypper.cc +++ b/src/Zypper.cc @@ -2212,7 +2212,7 @@ void Zypper::processCommandOptions() {"uninstalled-only", no_argument, 0, 'u'}, {"match-substrings", no_argument, 0, 0}, {"match-words", no_argument, 0, 0}, - {"match-exact", no_argument, 0, 0}, + {"match-exact", no_argument, 0, 'x'}, {"provides", no_argument, 0, 0}, {"requires", no_argument, 0, 0}, {"recommends", no_argument, 0, 0}, @@ -2245,7 +2245,7 @@ void Zypper::processCommandOptions() " Command options:\n" " --match-substrings Search for a match to partial words (default).\n" " --match-words Search for a match to whole words only.\n" - " --match-exact Searches for an exact match of the search strings.\n" + "-x, --match-exact Searches for an exact match of the search strings.\n" " --provides Search for packages which provide the search strings.\n" " --recommends Search for packages which recommend the search strings.\n" " --requires Search for packages which require the search strings.\n" diff --git a/tests/utils/text_test.cc b/tests/utils/text_test.cc index f8d713d..6581de1 100644 --- a/tests/utils/text_test.cc +++ b/tests/utils/text_test.cc @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(mbs_iterator) BOOST_CHECK_EQUAL( s.size(), 27 ); BOOST_CHECK_EQUAL( mbs_width(s), 7 ); - mbs::MbsIterator it( cs.str() ); + mbs::MbsIterator it( s ); BOOST_CHECK_EQUAL( *it, L'\033' ); BOOST_CHECK_EQUAL( it.size(), 14 ); BOOST_CHECK_EQUAL( it.columns(), 0 ); -- 2.7.4