From: Mike Gabriel Date: Mon, 17 Sep 2018 11:31:02 +0000 (+0200) Subject: Fix some typo flaws in output messages X-Git-Tag: archive/raspbian/17.35.10-1+rpi1~1^2^2^2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ef5215aeb76373b974a62ef43cc0ee8eff34724;p=libzypp.git Fix some typo flaws in output messages Gbp-Pq: Name 1003_various-typo-fixes.patch --- diff --git a/doc/zypp-NameReqPrv.1.txt b/doc/zypp-NameReqPrv.1.txt index cc1708f..4ae835b 100644 --- a/doc/zypp-NameReqPrv.1.txt +++ b/doc/zypp-NameReqPrv.1.txt @@ -24,11 +24,11 @@ Reported matches show the packages 'internal id', 'name', 'version' and 'archite -------------------- 2431 zypper-1.9.16-22.2.x86_64 (99)@System openSUSE 1400499579 - nam: zypper + name: zypper 40947 zypper-1.9.3-1.1.x86_64 (99)repo-oss (13.1) openSUSE 1383049437 - nam: zypper + name: zypper 56140 zypper-1.9.16-22.2.x86_64 (99)repo-oss-update (13.1) openSUSE 1400499579 - nam: zypper + name: zypper -------------------- diff --git a/package/libzypp.changes b/package/libzypp.changes index c5f9299..4372093 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -4394,7 +4394,7 @@ Thu Jan 22 10:41:27 CET 2009 - ma@suse.de ------------------------------------------------------------------- Fri Jan 9 17:01:10 CET 2009 - jkupec@suse.cz -- handle HTTP 503 reponses as temporary errors (bnc #462545) +- handle HTTP 503 responses as temporary errors (bnc #462545) ------------------------------------------------------------------- Thu Dec 18 22:26:18 CET 2008 - ma@suse.de diff --git a/zypp/Fetcher.cc b/zypp/Fetcher.cc index c6bf217..f655ae8 100644 --- a/zypp/Fetcher.cc +++ b/zypp/Fetcher.cc @@ -453,7 +453,7 @@ namespace zypp catch ( media::MediaFileNotFoundException & exception ) { ZYPP_CAUGHT( exception ); - WAR << "Skiping subtree hidden at " << resource.filename() << endl; + WAR << "Skipping subtree hidden at " << resource.filename() << endl; return; } diff --git a/zypp/base/InterProcessMutex.cc b/zypp/base/InterProcessMutex.cc index a9c9e69..adde5e3 100644 --- a/zypp/base/InterProcessMutex.cc +++ b/zypp/base/InterProcessMutex.cc @@ -277,7 +277,7 @@ InterProcessMutex::InterProcessMutex( const Options &poptions ) } } // end loop - LMIL << "Lock intialized" << endl; + LMIL << "Lock initialized" << endl; } diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc index 1d16827..7e17d33 100644 --- a/zypp/media/MediaCurl.cc +++ b/zypp/media/MediaCurl.cc @@ -1463,7 +1463,7 @@ void MediaCurl::doGetFileCopy(const Pathname & filename , const Pathname & targe } else { - WAR << "Could not get the reponse code." << endl; + WAR << "Could not get the response code." << endl; } if (modified || infoRet != CURLE_OK) diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc index 5a52ada..02bb71e 100644 --- a/zypp/media/MediaHandler.cc +++ b/zypp/media/MediaHandler.cc @@ -315,7 +315,7 @@ MediaHandler::setAttachPrefix(const Pathname &attach_prefix) { if( attach_prefix.empty()) { - MIL << "Reseting to built-in attach point prefixes." + MIL << "Resetting to built-in attach point prefixes." << std::endl; MediaHandler::_attachPrefix = attach_prefix; return true; diff --git a/zypp/media/MediaMultiCurl.cc b/zypp/media/MediaMultiCurl.cc index 670a4f3..14c311c 100644 --- a/zypp/media/MediaMultiCurl.cc +++ b/zypp/media/MediaMultiCurl.cc @@ -1380,7 +1380,7 @@ void MediaMultiCurl::doGetFileCopy( const Pathname & filename , const Pathname & } else { - WAR << "Could not get the reponse code." << endl; + WAR << "Could not get the response code." << endl; } bool ismetalink = false; diff --git a/zypp/repo/PackageDelta.cc b/zypp/repo/PackageDelta.cc index 608ab00..c0e2559 100644 --- a/zypp/repo/PackageDelta.cc +++ b/zypp/repo/PackageDelta.cc @@ -107,7 +107,7 @@ namespace zypp break; default: - WAR << "Igore unknown attribute: " << it << endl; + WAR << "Ignore unknown attribute: " << it << endl; } } diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 0f98bdb..259a7d7 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -258,9 +258,9 @@ namespace zypp return str << "search nothing"; if ( obj.attr() ) - str << "seach " << obj.attr() << " in "; + str << "search " << obj.attr() << " in "; else - str << "seach ALL in "; + str << "search ALL in "; if ( obj.solvable() ) return str << obj.solvable(); diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index a5389b3..5fd6f31 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -1193,7 +1193,7 @@ namespace zypp } else { - DBG << "dryRun: Not stroring non-package data." << endl; + DBG << "dryRun: Not storing non-package data." << endl; } /////////////////////////////////////////////////////////////////// diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc index af78692..b62017c 100644 --- a/zypp/target/rpm/BinHeader.cc +++ b/zypp/target/rpm/BinHeader.cc @@ -261,7 +261,7 @@ unsigned BinHeader::int_list( tag tag_r, intList & lst_r ) const return lst_r.set( headerget.val(), headerget.cnt(), headerget.type() ); default: - INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -292,7 +292,7 @@ unsigned BinHeader::string_list( tag tag_r, stringList & lst_r ) const return lst_r.set( (char**)headerget.val(), headerget.cnt() ); default: - INT << "RPM_TAG MISSMATCH: RPM_STRING_ARRAY_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_STRING_ARRAY_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -335,7 +335,7 @@ int BinHeader::int_val( tag tag_r ) const #endif default: - INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -366,7 +366,7 @@ std::string BinHeader::string_val( tag tag_r ) const return (char*)headerget.val(); default: - INT << "RPM_TAG MISSMATCH: RPM_STRING_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_STRING_TYPE " << tag_r << " got type " << headerget.type() << endl; } } }