Skip to content

Commit

Permalink
Fix several typos in output messages and comments (fixes #29)
Browse files Browse the repository at this point in the history
  • Loading branch information
mlandres committed Sep 26, 2014
1 parent 7f498c0 commit 01080b5
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions tests/zypp/Fetcher_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ BOOST_AUTO_TEST_CASE(enqueue_digested_images_file_content_autoindex_unsigned)
// it should throw because unsigned file throws
BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), FileCheckException);
fetcher.reset();
// the target file was NOT transfered
// the target file was NOT transferred
BOOST_CHECK( ! PathInfo(dest.path() + "/images/images.xml").isExist() );
fetcher.reset();
}
Expand Down Expand Up @@ -359,7 +359,7 @@ BOOST_AUTO_TEST_CASE(enqueuedir_http)

BOOST_CHECK( ! PathInfo(dest.path() + "/complexdir-broken/subdir2/subdir2-file1.txt").isExist() );

// this one got transfered before the failure, so it is there
// this one got transferred before the failure, so it is there
BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file1.txt").isExist() );
BOOST_CHECK( ! PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file2.txt").isExist() );

Expand Down
4 changes: 2 additions & 2 deletions tests/zypp/KeyRingTestReceiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ struct KeyRingTestSignalReceiver : zypp::callback::ReceiveReport<zypp::KeyRingSi

virtual void trustedKeyAdded( const zypp::PublicKey &key )
{
MIL << "TEST: trusted key added to zypp Keyring. Syncronizing keys with fake rpm keyring" << std::endl;
MIL << "TEST: trusted key added to zypp Keyring. Synchronizing keys with fake rpm keyring" << std::endl;
_trusted_key_added_called = true;
//std::cout << "trusted key added to zypp Keyring. Syncronizing keys with rpm keyring" << std::endl;
//std::cout << "trusted key added to zypp Keyring. Synchronizing keys with rpm keyring" << std::endl;
//_rpmdb.importZyppKeyRingTrustedKeys();
//_rpmdb.exportTrustedKeysInZyppKeyRing();
}
Expand Down
4 changes: 2 additions & 2 deletions zypp/Fetcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ namespace zypp
if ( resource.optional() )
{
ZYPP_CAUGHT(excpt_r);
WAR << "optional resource " << resource << " could not be transfered" << endl;
WAR << "optional resource " << resource << " could not be transferred" << endl;
return;
}
else
Expand Down Expand Up @@ -798,7 +798,7 @@ namespace zypp

provideToDest(media, (*it_res)->location, dest_dir, (*it_res)->deltafile);

// if the file was not transfered, and no exception, just
// if the file was not transferred, and no exception, just
// return, as it was an optional file
if ( ! PathInfo(dest_dir + (*it_res)->location.filename()).isExist() )
return;
Expand Down
10 changes: 5 additions & 5 deletions zypp/Fetcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ namespace zypp
* checksums ) that will be retrieved and read
* before the job processing starts.
*
* Nothing will be transfered or checked
* Nothing will be transferred or checked
* until \ref start() is called.
*
* The index is relative to the media path, and
Expand All @@ -181,15 +181,15 @@ namespace zypp

/**
* Enqueue a object for transferal, they will not
* be transfered until \ref start() is called
* be transferred until \ref start() is called
*
*/
void enqueue( const OnMediaLocation &resource,
const FileChecker &checker = FileChecker() );

/**
* Enqueue a object for transferal, they will not
* be transfered until \ref start() is called
* be transferred until \ref start() is called
*
* \note As \ref OnMediaLocation contains the digest information,
* a \ref ChecksumFileChecker is automatically added to the
Expand Down Expand Up @@ -244,7 +244,7 @@ namespace zypp
* in each subdirectory.
*
* \note Every file CHECKSUMS.* except of CHECKSUMS.(asc|key|(void)) will
* not be transfered and will be ignored.
* not be transferred and will be ignored.
*
*/
void enqueueDir( const OnMediaLocation &resource,
Expand Down Expand Up @@ -288,7 +288,7 @@ namespace zypp
* in each subdirectory.
*
* \note Every file CHECKSUMS.* except of CHECKSUMS.(asc|key|(void)) will
* not be transfered and will be ignored.
* not be transferred and will be ignored.
*
*/
void enqueueDigestedDir( const OnMediaLocation &resource,
Expand Down
8 changes: 4 additions & 4 deletions zypp/RepoManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1677,7 +1677,7 @@ namespace zypp
// TranslatorExplanation '%s' is a filename
ZYPP_THROW(RepoException( todelete, str::form( _("Can't delete '%s'"), todelete.filepath().c_str() )));
}
MIL << todelete.alias() << " sucessfully deleted." << endl;
MIL << todelete.alias() << " successfully deleted." << endl;
}
else
{
Expand Down Expand Up @@ -1714,7 +1714,7 @@ namespace zypp
cleanMetadata( todelete, mSubprogrcv );
cleanPackages( todelete, pSubprogrcv );
reposManip().erase(todelete);
MIL << todelete.alias() << " sucessfully deleted." << endl;
MIL << todelete.alias() << " successfully deleted." << endl;
HistoryLog(_options.rootDir).removeRepository(todelete);
return;
} // else filepath is empty
Expand Down Expand Up @@ -1866,7 +1866,7 @@ namespace zypp
// TranslatorExplanation '%s' is a filename
ZYPP_THROW(ServiceException( service, str::form( _("Can't delete '%s'"), location.c_str() ) ));
}
MIL << alias << " sucessfully deleted." << endl;
MIL << alias << " successfully deleted." << endl;
}
else
{
Expand All @@ -1885,7 +1885,7 @@ namespace zypp
it->dumpAsIniOn(file);
}

MIL << alias << " sucessfully deleted from file " << location << endl;
MIL << alias << " successfully deleted from file " << location << endl;
}

// now remove all repositories added by this service
Expand Down
2 changes: 1 addition & 1 deletion zypp/target/rpm/RpmDb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ void RpmDb::initDatabase( Pathname root_r, Pathname dbPath_r, bool doRebuild_r )
}
}

MIL << "Syncronizing keys with zypp keyring" << endl;
MIL << "Synchronizing keys with zypp keyring" << endl;
syncTrustedKeys();

// Close the database in case any write acces (create/convert)
Expand Down
2 changes: 1 addition & 1 deletion zypp/ui/Selectable.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ namespace zypp
* If the specified candidate is not already installed (\ref identicalInstalled),
* and the \a causer_r has sufficient permisssion, then \a newCandidate_r is set as the new
* candidate (\ref setCandidate) and selected for installation.
* \returns \c True if \a newCandidate_r is already installed or sucessfully selected for installation.
* \returns \c True if \a newCandidate_r is already installed or successfully selected for installation.
*/
bool setOnSystem( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r = ResStatus::USER );

Expand Down

0 comments on commit 01080b5

Please sign in to comment.