[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20250329-27-gc27f8a9

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 calm/calm.py                               | 2 +-
 calm/package.py                            | 2 +-
 calm/reports.py                            | 1 +
 test/testdata/process_arch/htdocs.expected | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index a5e2b07..59a7211 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -764,7 +764,7 @@ def do_daemon(args, state):
                                 # files in the arch directory
                                 if (filename != 'sha512.sum') and 
((path.count(os.path.sep) > depth) or filename == ".touch"):
                                     action |= Event.read_relarea
-                            elif path.startswith(args.stagingdir) and 
(filename != 'tmp'):
+                            elif path.startswith(args.stagingdir) and not 
path.endswith('/tmp'):
                                 action |= Event.read_uploads
                             elif (path.startswith(args.homedir)) and (filename 
== ".sftp-session-close"):
                                 action |= Event.read_uploads
diff --git a/calm/package.py b/calm/package.py
index c772199..84d956f 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1870,7 +1870,7 @@ def stale_packages(packages, vault_requests):
         # clean up freshness mark
         for v in po.versions():
             try:
-                delattr(po.tar(v), 'fresh')
+                del po.tar(v).fresh
             except AttributeError:
                 pass
 
diff --git a/calm/reports.py b/calm/reports.py
index 161921a..cbbd525 100644
--- a/calm/reports.py
+++ b/calm/reports.py
@@ -581,6 +581,7 @@ def do_reports(args, packages):
 
     provides_rebuild(args, packages, 'perl_rebuilds.html', 'perl_base', 
reportlist)
     provides_rebuild(args, packages, 'ruby_rebuilds.html', 'ruby', reportlist)
+    provides_rebuild(args, packages, 'php_rebuilds.html', 'php', reportlist)
     python_rebuild(args, packages, 'python_rebuilds.html', reportlist)
 
     maintainer_activity_report(args, packages, reportlist)
diff --git a/test/testdata/process_arch/htdocs.expected 
b/test/testdata/process_arch/htdocs.expected
index a9c0afb..5bf6eeb 100644
--- a/test/testdata/process_arch/htdocs.expected
+++ b/test/testdata/process_arch/htdocs.expected
@@ -80,6 +80,7 @@
              'maintainer_yitzchak_scott-thoennes.html',
              'maintainer_yue_ren.html',
              'perl_rebuilds.html',
+             'php_rebuilds.html',
              'ruby_rebuilds.html',
              'unmaintained.html',
              'unstable.html'],