diff -u'Nrpk~' apt-0.5.15cnc6~/cmdline/apt-cache.cc apt-0.5.15cnc6/cmdline/apt-cache.cc --- apt-0.5.15cnc6~/cmdline/apt-cache.cc 2005-05-11 16:40:53 +0400 +++ apt-0.5.15cnc6/cmdline/apt-cache.cc 2005-05-11 16:53:52 +0400 @@ -1958,9 +1958,9 @@ int main(int argc,const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false || - pkgInitConfig(*_config) == false || - pkgInitSystem(*_config,_system) == false) + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false || + CmdL.Parse(argc,argv) == false) { _error->DumpErrors(); return 100; diff -u'Nrpk~' apt-0.5.15cnc6~/cmdline/apt-cdrom.cc apt-0.5.15cnc6/cmdline/apt-cdrom.cc --- apt-0.5.15cnc6~/cmdline/apt-cdrom.cc 2005-05-11 16:40:53 +0400 +++ apt-0.5.15cnc6/cmdline/apt-cdrom.cc 2005-05-11 16:46:30 +0400 @@ -901,9 +901,9 @@ int main(int argc,const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false || - pkgInitConfig(*_config) == false || - pkgInitSystem(*_config,_system) == false) + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false || + CmdL.Parse(argc,argv) == false) { _error->DumpErrors(); return 100; diff -u'Nrpk~' apt-0.5.15cnc6~/cmdline/apt-config.cc apt-0.5.15cnc6/cmdline/apt-config.cc --- apt-0.5.15cnc6~/cmdline/apt-config.cc 2005-05-11 16:40:53 +0400 +++ apt-0.5.15cnc6/cmdline/apt-config.cc 2005-05-11 16:42:34 +0400 @@ -109,9 +109,9 @@ int main(int argc,const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false || - pkgInitConfig(*_config) == false || - pkgInitSystem(*_config,_system) == false) + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false || + CmdL.Parse(argc,argv) == false) { _error->DumpErrors(); return 100; diff -u'Nrpk~' apt-0.5.15cnc6~/cmdline/apt-get.cc apt-0.5.15cnc6/cmdline/apt-get.cc --- apt-0.5.15cnc6~/cmdline/apt-get.cc 2005-05-11 16:40:53 +0400 +++ apt-0.5.15cnc6/cmdline/apt-get.cc 2005-05-11 16:42:51 +0400 @@ -3177,9 +3177,9 @@ int main(int argc,const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false || - pkgInitConfig(*_config) == false || - pkgInitSystem(*_config,_system) == false) + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false || + CmdL.Parse(argc,argv) == false) { if (_config->FindB("version") == true) ShowHelp(CmdL); diff -u'Nrpk~' apt-0.5.15cnc6~/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-shell.cc --- apt-0.5.15cnc6~/cmdline/apt-shell.cc 2005-05-11 16:40:53 +0400 +++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-05-11 16:44:53 +0400 @@ -4544,9 +4544,9 @@ int main(int argc,const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(CommandArgs(""),_config); - if (CmdL.Parse(argc,argv) == false || - pkgInitConfig(*_config) == false || - pkgInitSystem(*_config,_system) == false) + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false || + CmdL.Parse(argc,argv) == false) { if (_config->FindB("version") == true) ShowHelp(CmdL);