Attachment 297061 Details for Bug 436332 – add --strict option

[patch] add --strict option

rhnpush-strict.patch (text/plain), 2.52 KB, created by Daniel Mach on 2008-03-06 15:47:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Mach

Created: 2008-03-06 15:47:10 UTC

Size: 2.52 KB

patch

obsolete

>--- rhnpush.py.orig	2008-02-12 17:50:44.000000000 +0100
>+++ rhnpush.py	2008-03-06 16:16:45.000000000 +0100
>@@ -70,18 +70,23 @@
>         Option(     '--no-session-caching',  action='store_true', 
>             help="Disables session-token support. Useful for using rhnpush with pre-4.0.6 satellites."),
>         Option(     '--tolerant',   action='store_true', 
>-            help="If rhnpush errors while uploading a package, continue uploading the rest of the packages.")
>+            help="If rhnpush errors while uploading a package, continue uploading the rest of the packages."),
>+        Option(     '--strict',   action='store_true', 
>+            help="Stop pushing when any error occurs.")
>     ]
> 
>     #Having to maintain a store_true list is ugly. I'm trying to get rid of this.
>     #12/22/05 wregglej 173287   Added no_cache to true_list so it's value gets changed from a string to an int.
>     true_list = ['usage', 'test', 'source', 'header', 'nullorg', 'newest',\
>                  'nosig', 'force', 'list', 'stdin', 'new_cache','extended_test', 'no_cache',\
>-                 'no_session_caching', 'tolerant']
>+                 'no_session_caching', 'tolerant', 'strict']
>     optionParser = OptionParser(option_list=optionsTable, usage="%prog [OPTION] [<package>]")
>     manager = rhnpush_confmanager.ConfManager(optionParser, true_list)
>     options = manager.get_config()
>     
>+    if options.tolerant and options.strict:
>+        optionParser.error("Cannot use --tolerant and --strict at the same time.")
>+    
>     upload = UploadClass(options, files=options.files)
> 
>     if options.usage:
>@@ -343,6 +348,8 @@
> 
>                 elif  md5pkgdata[pkg_key] == "on-disk" and not self.options.force:
>                     channel_packages.append(pkgs_info[pkg_key])
>+                    if self.options.strict:
>+                        self.die(-1, "ERROR: Package %s on disk but not in db" % pkg)
>                     self.warn(0,"Package on disk but not on db -- Skipping Upload "%pkg)
>                     continue
>                 
>@@ -350,6 +357,8 @@
>                     if self.options.force:
>                         self.warn(1,"Package checksum %s mismatch  -- Forcing Upload"% pkg)
>                     else:
>+                        if self.options.strict:
>+                            self.die(-1, "ERROR: Package checksum %s mismatch (use --force to force upload)" % pkg)
>                         self.warn(0,"Package checksum %s mismatch -- Skipping Upload (use --force to force upload)"%pkg)
>                         continue
>             else:

Actions: View | Diff

Attachments on bug 436332: 297061