New Upstream Snapshot - pynag
Ready changes
Summary
Merged new upstream version: 1.1.2+git20211022.1.e72cf7c+dfsg (was: 1.1.2+dfsg).
Resulting package
Built on 2022-11-15T15:51 (took 5m49s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots pynagapt install -t fresh-snapshots python3-pynag
Diff
diff --git a/PKG-INFO b/PKG-INFO
index fc0d7e4..1b1f9d0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,4 +1,4 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: pynag
Version: 1.1.2
Summary: Python modules for Nagios plugins and configuration
@@ -6,9 +6,10 @@ Home-page: http://pynag.org/
Author: Drew Stinnett
Author-email: drew@drewlink.com
License: GPLv2
-Description:
- Python modules and utilities for pragmatically handling Nagios configuration
- file maintenance, status information, log file parsing and plug-in development.
-
-Platform: UNKNOWN
Requires: unittest2
+License-File: LICENSE
+License-File: AUTHORS
+
+
+Python modules and utilities for pragmatically handling Nagios configuration
+file maintenance, status information, log file parsing and plug-in development.
diff --git a/debian/changelog b/debian/changelog
index 90430e3..f4de7c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pynag (1.1.2+git20211022.1.e72cf7c+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 15 Nov 2022 15:47:45 -0000
+
pynag (1.1.2+dfsg-3) unstable; urgency=medium
[ Stefano Rivera ]
diff --git a/docs/pynag-command.rst b/docs/pynag-command.rst
index 89929e3..c2ba32a 100644
--- a/docs/pynag-command.rst
+++ b/docs/pynag-command.rst
@@ -43,7 +43,7 @@ sub-commands
*copy*
- Copy objects, specifiying which attributes to change
+ Copy objects, specifying which attributes to change
| pynag copy <WHERE ...> <SET attr1=value1 [attr2=value2] ...>
@@ -87,7 +87,7 @@ these work just fine:
| pynag list host_name address WHERE address__exists=True
| pynag list host_name WHERE register__isnot=0
-If you specificly want to match against non existent attribute,
+If you specifically want to match against non existent attribute,
use attribute__exists=True or attribute=None.
The pynag filter supports few parameters that are not just attributes.
diff --git a/man/pynag.1 b/man/pynag.1
index d9dedca..f17f306 100644
--- a/man/pynag.1
+++ b/man/pynag.1
@@ -131,7 +131,7 @@ pynag add <object_type> <attr1=value1> [attr2=value2]
\fIcopy\fP
.INDENT 0.0
.INDENT 3.5
-Copy objects, specifiying which attributes to change
+Copy objects, specifying which attributes to change
.INDENT 0.0
.INDENT 3.5
.nf
diff --git a/pynag.egg-info/PKG-INFO b/pynag.egg-info/PKG-INFO
index fc0d7e4..1b1f9d0 100644
--- a/pynag.egg-info/PKG-INFO
+++ b/pynag.egg-info/PKG-INFO
@@ -1,4 +1,4 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: pynag
Version: 1.1.2
Summary: Python modules for Nagios plugins and configuration
@@ -6,9 +6,10 @@ Home-page: http://pynag.org/
Author: Drew Stinnett
Author-email: drew@drewlink.com
License: GPLv2
-Description:
- Python modules and utilities for pragmatically handling Nagios configuration
- file maintenance, status information, log file parsing and plug-in development.
-
-Platform: UNKNOWN
Requires: unittest2
+License-File: LICENSE
+License-File: AUTHORS
+
+
+Python modules and utilities for pragmatically handling Nagios configuration
+file maintenance, status information, log file parsing and plug-in development.
diff --git a/pynag.egg-info/requires.txt b/pynag.egg-info/requires.txt
index 61ec2f4..8190f4b 100644
--- a/pynag.egg-info/requires.txt
+++ b/pynag.egg-info/requires.txt
@@ -1,2 +1,2 @@
-six
chardet
+six
diff --git a/pynag/Model/__init__.py b/pynag/Model/__init__.py
index ea8f024..1243b77 100644
--- a/pynag/Model/__init__.py
+++ b/pynag/Model/__init__.py
@@ -921,7 +921,7 @@ class ObjectDefinition(object):
:returns: The new object definition
"""
new_me = self.copy(filename=filename)
- self.delete()
+ self.delete(cleanup_related_items=False)
return new_me
def copy(self, recursive=False, filename=None, **args):
diff --git a/pynag/Utils/misc.py b/pynag/Utils/misc.py
index ac12d13..7382ed9 100644
--- a/pynag/Utils/misc.py
+++ b/pynag/Utils/misc.py
@@ -167,6 +167,7 @@ class FakeNagiosEnvironment(object):
if self._model_is_dirty:
self.restore_model()
self.clean_up()
+ time.sleep(.2)
def start(self, start_command=None, timeout=10):
self.configure_p1_file()
@@ -201,6 +202,7 @@ class FakeNagiosEnvironment(object):
message += "=============\nLog File output\n{log_file_output}\n"
message = message.format(**locals())
raise Exception(message)
+ time.sleep(.2)
return result
def stop(self, stop_command=None):
@@ -212,7 +214,7 @@ class FakeNagiosEnvironment(object):
if not stop_command:
stop_command = "kill -9 %s" % pid
result = pynag.Utils.runCommand(stop_command)
- time.sleep(0.5)
+ time.sleep(.2)
return result
def configure_livestatus(self):
diff --git a/scripts/pynag b/scripts/pynag
index 08445da..296d542 100755
--- a/scripts/pynag
+++ b/scripts/pynag
@@ -399,7 +399,9 @@ def acknowledge():
parser.add_option("--author", dest="author",
default="pynag",help="Author to put on the acknowledgement")
parser.add_option("--timestamp", dest="ts",
- default="0",help="Timestamp of the acknowledgement (default: now)")
+ default="0",help="Timestamp of the acknowledgement (default: now)"),
+ parser.add_option("--force", dest="force", action="store_true",
+ default=False,help="Don't prompt for confirmation")
(opts,args) = parser.parse_args(sys.argv[2:])
pynag.Model.cfg_file = opts.cfg_file
objects =[]
@@ -424,9 +426,10 @@ def acknowledge():
# Here we actually ack the objects
if opts.quiet == False:
pretty_print(objects)
- answer = input('Acknowledge these %s objects ? (y/N) ' % (len(objects)))
- if answer.lower() not in ('y', 'yes'):
- return
+ if not opts.force:
+ answer = input('Acknowledge these %s objects ? (y/N) ' % (len(objects)))
+ if answer.lower() not in ('y', 'yes'):
+ return
for i in objects:
if opts.quiet is False:
Debdiff
File lists identical (after any substitutions)
No differences were encountered between the control files of package pynag
No differences were encountered between the control files of package python3-pynag