Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	po/pakfire.pot

diff --cc po/pakfire.pot
index ac7da34629a92d76bfbad15378bda7ab5810ded0,795812e4466f2b3cd433faeb191b199e65521fc7..7a55bcb92151614161911c67f124d82e49b90b13
--- 1/po/pakfire.pot
--- 2/po/pakfire.pot
+++ b/po/pakfire.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-10-16 12:09+0200\n"
 -"POT-Creation-Date: 2011-10-16 10:39+0000\n"
++"POT-Creation-Date: 2011-10-16 12:45+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -77,11 -77,16 +77,16 @@@ msgstr "
  msgid "There are no packages to install."
  msgstr ""
  
- #: ../python/pakfire/base.py:465
+ #: ../python/pakfire/base.py:319
+ #, python-format
+ msgid "Excluding %s."
+ msgstr ""
+ 
 -#: ../python/pakfire/base.py:466
++#: ../python/pakfire/base.py:473
  msgid "Build command has failed."
  msgstr ""
  
- #: ../python/pakfire/base.py:545
 -#: ../python/pakfire/base.py:546
++#: ../python/pakfire/base.py:553
  msgid "Everything is fine."
  msgstr ""
  
@@@ -262,7 -271,7 +271,7 @@@ msgstr "
  msgid "You cannot run pakfire-builder in a pakfire chroot."
  msgstr ""
  
- #: ../python/pakfire/cli.py:330 ../python/pakfire/cli.py:587
 -#: ../python/pakfire/cli.py:335 ../python/pakfire/cli.py:590
++#: ../python/pakfire/cli.py:335 ../python/pakfire/cli.py:592
  msgid "Pakfire builder command line interface."
  msgstr ""
  
@@@ -270,85 -279,81 +279,85 @@@
  msgid "Update the package indexes."
  msgstr ""
  
- #: ../python/pakfire/cli.py:391 ../python/pakfire/cli.py:607
 -#: ../python/pakfire/cli.py:396 ../python/pakfire/cli.py:610
++#: ../python/pakfire/cli.py:396 ../python/pakfire/cli.py:612
  msgid "Build one or more packages."
  msgstr ""
  
- #: ../python/pakfire/cli.py:393 ../python/pakfire/cli.py:609
 -#: ../python/pakfire/cli.py:398 ../python/pakfire/cli.py:612
++#: ../python/pakfire/cli.py:398 ../python/pakfire/cli.py:614
  msgid "Give name of at least one package to build."
  msgstr ""
  
- #: ../python/pakfire/cli.py:397 ../python/pakfire/cli.py:613
 -#: ../python/pakfire/cli.py:402 ../python/pakfire/cli.py:616
++#: ../python/pakfire/cli.py:402 ../python/pakfire/cli.py:618
  msgid "Build the package for the given architecture."
  msgstr ""
  
- #: ../python/pakfire/cli.py:399 ../python/pakfire/cli.py:427
- #: ../python/pakfire/cli.py:615
 -#: ../python/pakfire/cli.py:404 ../python/pakfire/cli.py:430
 -#: ../python/pakfire/cli.py:618
++#: ../python/pakfire/cli.py:404 ../python/pakfire/cli.py:432
++#: ../python/pakfire/cli.py:620
  msgid "Path were the output files should be copied to."
  msgstr ""
  
- #: ../python/pakfire/cli.py:401 ../python/pakfire/cli.py:416
- #: ../python/pakfire/cli.py:617
 -#: ../python/pakfire/cli.py:406 ../python/pakfire/cli.py:419
 -#: ../python/pakfire/cli.py:620
++#: ../python/pakfire/cli.py:406 ../python/pakfire/cli.py:421
++#: ../python/pakfire/cli.py:622
  msgid "Mode to run in. Is either 'release' or 'development' (default)."
  msgstr ""
  
- #: ../python/pakfire/cli.py:403
 -#: ../python/pakfire/cli.py:411
 -msgid "Go into a shell."
++#: ../python/pakfire/cli.py:408
 +msgid "Run a shell after a successful build."
  msgstr ""
  
- #: ../python/pakfire/cli.py:408
+ #: ../python/pakfire/cli.py:413
 +msgid "Go into a shell."
 +msgstr ""
 +
- #: ../python/pakfire/cli.py:410
++#: ../python/pakfire/cli.py:415
  msgid "Give name of a package."
  msgstr ""
  
- #: ../python/pakfire/cli.py:414
 -#: ../python/pakfire/cli.py:417
++#: ../python/pakfire/cli.py:419
  msgid "Emulated architecture in the shell."
  msgstr ""
  
- #: ../python/pakfire/cli.py:421
 -#: ../python/pakfire/cli.py:424
++#: ../python/pakfire/cli.py:426
  msgid "Generate a source package."
  msgstr ""
  
- #: ../python/pakfire/cli.py:423
 -#: ../python/pakfire/cli.py:426
++#: ../python/pakfire/cli.py:428
  msgid "Give name(s) of a package(s)."
  msgstr ""
  
- #: ../python/pakfire/cli.py:500
 -#: ../python/pakfire/cli.py:503
++#: ../python/pakfire/cli.py:505
  msgid "Pakfire server command line interface."
  msgstr ""
  
- #: ../python/pakfire/cli.py:537
 -#: ../python/pakfire/cli.py:540
++#: ../python/pakfire/cli.py:542
  msgid "Request a build job from the server."
  msgstr ""
  
- #: ../python/pakfire/cli.py:543
 -#: ../python/pakfire/cli.py:546
++#: ../python/pakfire/cli.py:548
  msgid "Send a keepalive to the server."
  msgstr ""
  
- #: ../python/pakfire/cli.py:550
 -#: ../python/pakfire/cli.py:553
++#: ../python/pakfire/cli.py:555
  msgid "Update all repositories."
  msgstr ""
  
- #: ../python/pakfire/cli.py:556
 -#: ../python/pakfire/cli.py:559
++#: ../python/pakfire/cli.py:561
  msgid "Repository management commands."
  msgstr ""
  
- #: ../python/pakfire/cli.py:564
 -#: ../python/pakfire/cli.py:567
++#: ../python/pakfire/cli.py:569
  msgid "Create a new repository index."
  msgstr ""
  
- #: ../python/pakfire/cli.py:565
 -#: ../python/pakfire/cli.py:568
++#: ../python/pakfire/cli.py:570
  msgid "Path to the packages."
  msgstr ""
  
- #: ../python/pakfire/cli.py:566
 -#: ../python/pakfire/cli.py:569
++#: ../python/pakfire/cli.py:571
  msgid "Path to input packages."
  msgstr ""
  
- #: ../python/pakfire/cli.py:619
 -#: ../python/pakfire/cli.py:622
++#: ../python/pakfire/cli.py:624
  msgid "Do not verify build dependencies."
  msgstr ""
  

diff --cc python/pakfire/base.py
Simple merge

diff --cc python/pakfire/cli.py
Simple merge