patchman 3.0.8__tar.gz → 3.0.10__tar.gz

{patchman-3.0.8 → patchman-3.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: patchman
-Version: 3.0.8
+Version: 3.0.10
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong
@@ -15,17 +15,17 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS
-Requires-Dist: Django==3.2.23
+Requires-Dist: Django==3.2.25
 Requires-Dist: django-tagging==0.5.0
 Requires-Dist: django-extensions==3.2.1
 Requires-Dist: django-bootstrap3==23.1
 Requires-Dist: progressbar==2.5
 Requires-Dist: python-debian==0.1.49
-Requires-Dist: lxml==4.9.2
+Requires-Dist: lxml==4.9.4
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: chardet==4.0.0
-Requires-Dist: requests==2.31.0
+Requires-Dist: requests==2.32.3
 Requires-Dist: colorama==0.4.4
 Requires-Dist: djangorestframework==3.13.1
 Requires-Dist: django-filter==21.1

patchman-3.0.10/VERSION.txt

@@ -0,0 +1 @@
+3.0.10

{patchman-3.0.8 → patchman-3.0.10}/modules/models.py

@@ -39,7 +39,7 @@ class Module(models.Model):
         ordering = ('name', 'stream',)
 
     def __str__(self):
-        return f'{self.name}-{self.stream}'
+        return f'{self.name}-{self.stream}-{self.version}-{self.version}-{self.context}'
 
     def get_absolute_url(self):
         return reverse('modules:module_detail', args=[str(self.id)])

{patchman-3.0.8 → patchman-3.0.10}/modules/templates/modules/module_table.html

@@ -2,8 +2,10 @@
 <table class="table table-striped table-bordered table-hover table-condensed table-responsive">
   <thead>
     <tr>
-      <th class="col-sm-auto">Module</th>
-      <th class="col-sm-auto">ID</th>
+      <th class="col-sm-auto">Name</th>
+      <th class="col-sm-auto">Stream</th>
+      <th class="col-sm-auto">Version</th>
+      <th class="col-sm-auto">Context</th>
       <th class="col-sm-auto">Repo</th>
       <th class="col-sm-auto">Packages</th>
       <th class="col-md-auto">Enabled on Hosts</th>
@@ -12,8 +14,10 @@
   <tbody>
     {% for module in object_list %}
       <tr>
-        <td><a href="{{ module.get_absolute_url }}">{{ module }}</a></td>
-        <td>{{ module.id }}</td>
+        <td><a href="{{ module.get_absolute_url }}">{{ module.name }}</a></td>
+        <td>{{ module.stream }}</td>
+        <td>{{ module.version }}</td>
+        <td>{{ module.context }}</td>
         <td><a href="{{ module.repo.get_absolute_url }}">{{ module.repo }}</a></td>
         <td>{{ module.packages.count }}</td>
         <td>{{ module.host_set.count }}</td>

{patchman-3.0.8 → patchman-3.0.10}/patchman.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: patchman
-Version: 3.0.8
+Version: 3.0.10
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong
@@ -15,17 +15,17 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS
-Requires-Dist: Django==3.2.23
+Requires-Dist: Django==3.2.25
 Requires-Dist: django-tagging==0.5.0
 Requires-Dist: django-extensions==3.2.1
 Requires-Dist: django-bootstrap3==23.1
 Requires-Dist: progressbar==2.5
 Requires-Dist: python-debian==0.1.49
-Requires-Dist: lxml==4.9.2
+Requires-Dist: lxml==4.9.4
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: chardet==4.0.0
-Requires-Dist: requests==2.31.0
+Requires-Dist: requests==2.32.3
 Requires-Dist: colorama==0.4.4
 Requires-Dist: djangorestframework==3.13.1
 Requires-Dist: django-filter==21.1

{patchman-3.0.8 → patchman-3.0.10}/patchman.egg-info/requires.txt

@@ -1,14 +1,14 @@
-Django==3.2.23
+Django==3.2.25
 django-tagging==0.5.0
 django-extensions==3.2.1
 django-bootstrap3==23.1
 progressbar==2.5
 python-debian==0.1.49
-lxml==4.9.2
+lxml==4.9.4
 defusedxml==0.7.1
 PyYAML==6.0.1
 chardet==4.0.0
-requests==2.31.0
+requests==2.32.3
 colorama==0.4.4
 djangorestframework==3.13.1
 django-filter==21.1

{patchman-3.0.8 → patchman-3.0.10}/reports/models.py

@@ -86,9 +86,12 @@ class Report(models.Model):
                  'reboot']
 
         for attr in attrs:
-            setattr(self, attr, data.get(attr).strip())
+            if data.get(attr):
+                setattr(self, attr, data.get(attr))
+            else:
+                setattr(self, attr, '')
 
-        if self.host is not None:
+        if self.host:
             self.host = self.host.lower()
             fqdn = self.host.split('.', 1)
             if len(fqdn) == 2:

{patchman-3.0.8 → patchman-3.0.10}/reports/utils.py

@@ -315,7 +315,7 @@ def parse_modules(modules_string):
 
 
 def process_module(module_str):
-    """ Processes a single sanitied module string and converts to a module
+    """ Processes a single sanitized module string and converts to a module
     """
     m_name = module_str[0]
     m_stream = module_str[1]
@@ -334,7 +334,7 @@ def process_module(module_str):
         m_repo = None
 
     packages = set()
-    for pkg_str in module_str[6:-1]:
+    for pkg_str in module_str[6:]:
         p_type = Package.RPM
         p_name, p_epoch, p_ver, p_rel, p_dist, p_arch = parse_package_string(pkg_str)
         package = get_or_create_package(p_name, p_epoch, p_ver, p_rel, p_arch, p_type)

{patchman-3.0.8 → patchman-3.0.10}/requirements.txt

@@ -1,14 +1,14 @@
-Django==3.2.23
+Django==3.2.25
 django-tagging==0.5.0
 django-extensions==3.2.1
 django-bootstrap3==23.1
 progressbar==2.5
 python-debian==0.1.49
-lxml==4.9.2
+lxml==4.9.4
 defusedxml==0.7.1
 PyYAML==6.0.1
 chardet==4.0.0
-requests==2.31.0
+requests==2.32.3
 colorama==0.4.4
 djangorestframework==3.13.1
 django-filter==21.1

patchman-3.0.8/VERSION.txt

@@ -1 +0,0 @@
-3.0.8