[Piuparts-commits] [SCM] Git repository for piuparts branch, master, updated. 18e6da998c6a87abec6bd0d6fe12f2c3b64b7337

[Holger Levsen]

The following commit has been merged in the master branch:
commit ef05a35e72e115e78a8a00c82bab1bba20ecfeb5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Aug 24 13:39:24 2011 +0200

    new option: "--fail-on-broken-symlinks". Remove option "--warn-symlinks" as this is the default now.

diff --git a/TODO b/TODO
index a5a0920..0c9ddc7 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,8 @@ for 0.42:
 
 - fix scripts for dash as default shell
 
+- preserve two uncommited scripts from my svn working copy: home/piupartsm/bin/biggest_blocker.sh and home/piupartss/bin/update-piuparts-snapshot
+
 
 for 0.43:
 
diff --git a/debian/changelog b/debian/changelog
index a2a11ec..0284834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ piuparts (0.41) UNRELEASED; urgency=low
     - run dpkg with --force-unsafe-io by default and introduce new option
       "--dpkg-noforce-unsafe-io" to disable this feature. (Closes: #633033)
       Thanks to Scott once more!
+    - new option: "--fail-on-broken-symlinks". Remove option "--warn-symlinks"
+      as this is the default now.
   * piuparts-slave: 
     - check if chroot-tgz is older than max-tgz-age (defaulting to 30 days)
       and recreate it, if it is. Keep backup and put in back in place when 
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 0c91c29..cc95386 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -111,6 +111,9 @@ Note that file: addresses works if the directories are made accessible from with
 *-N, --no-symlinks*::
   Don't check for broken symlinks.
 
+*--fail-on-broken-symlinks*::
+  Fail on broken symlinks. The default is to just issue those errors as warnings.
+
 *--no-upgrade-test*::
   Skip testing upgrade from an existing version in the archive.
 
@@ -159,9 +162,6 @@ Note that file: addresses works if the directories are made accessible from with
 *-V, --version*::
   Write out the version number of the program.
 
-*-W, --warn-symlinks*::
-  Check for broken symlinks, but warn only if found.
-
 *--warn-on-leftovers-after-purge*::
   Print a warning rather than failing if files are left behind after purge.
 
diff --git a/piuparts.py b/piuparts.py
index 52fc743..3c11676 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -23,7 +23,7 @@ This program sets up a minimal Debian system in a chroot, and installs
 and uninstalls packages and their dependencies therein, looking for
 problems.
 
-See the manual page (piuparts.1, generated from piuparts.docbook) for
+See the manual page (piuparts.1, generated from piuparts.1.txt) for 
 more usage information.
 
 Lars Wirzenius <liw at iki.fi>
@@ -154,7 +154,7 @@ class Settings:
         self.skip_cronfiles_test = False
         self.skip_logrotatefiles_test = False
         self.check_broken_symlinks = True
-        self.warn_broken_symlinks = False
+        self.warn_broken_symlinks = True
         self.debfoster_options = None
         self.do_not_verify_signatures = False
         self.ignored_files = [
@@ -2107,9 +2107,9 @@ def parse_command_line():
                       help="Print a warning rather than failing if "
                            "files are left behind after purge.")
 
-    parser.add_option("-W", "--warn-symlinks", action="store_true",
+    parser.add_option("--fail-on-broken-symlinks", action="store_true",
                       default=False,
-                      help="Warn only for broken symlinks.")
+                      help="Fail if broken symlinks are detected.")
     
     parser.add_option("--log-level", action="store",metavar='LEVEL',
                       default="dump",
@@ -2155,7 +2155,7 @@ def parse_command_line():
     settings.debian_mirrors = [parse_mirror_spec(x, defaults.get_components())
                                for x in opts.mirror]
     settings.check_broken_symlinks = not opts.no_symlinks
-    settings.warn_broken_symlinks = opts.warn_symlinks
+    settings.warn_broken_symlinks = not opts.fail_on_broken_symlinks
     settings.savetgz = opts.save
     settings.warn_on_others = opts.warn_on_others
     settings.warn_on_leftovers_after_purge = opts.warn_on_leftovers_after_purge

-- 
Git repository for piuparts