From 39c20ad4f1d5f6e915b5be8976b6a94885ca3b0c Mon Sep 17 00:00:00 2001
From: Andrew Gregory <andrew.gregory.8@gmail.com>
Date: Mon, 3 Jun 2019 00:32:36 -0700
Subject: hooks: rename type File to Path

Make it clearer that the targets are matched against both directories
and regular files and free up File to potentially refer specifically to
regular files in the future.  File is retained as a deprecated alias for
Path for the time being to avoid breaking existing hooks and will be
removed in a future release.

See FS#53136.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
 test/pacman/tests/hook-file-change-packages.py      | 2 +-
 test/pacman/tests/hook-file-remove-trigger-match.py | 2 +-
 test/pacman/tests/hook-file-upgrade-nomatch.py      | 2 +-
 test/pacman/tests/hook-target-list.py               | 2 +-
 test/pacman/tests/hook-type-reused.py               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/pacman/tests/hook-file-change-packages.py b/test/pacman/tests/hook-file-change-packages.py
index ad96fc14..4671dbe8 100644
--- a/test/pacman/tests/hook-file-change-packages.py
+++ b/test/pacman/tests/hook-file-change-packages.py
@@ -4,7 +4,7 @@ self.add_script("hook-script", ": > hook-output")
 self.add_hook("hook",
         """
         [Trigger]
-        Type = File
+        Type = Path
         Operation = Upgrade
         Target = bin/foo
 
diff --git a/test/pacman/tests/hook-file-remove-trigger-match.py b/test/pacman/tests/hook-file-remove-trigger-match.py
index 6c9375c0..ac50014c 100644
--- a/test/pacman/tests/hook-file-remove-trigger-match.py
+++ b/test/pacman/tests/hook-file-remove-trigger-match.py
@@ -4,7 +4,7 @@ self.add_script("hook-script", ": > hook-output")
 self.add_hook("hook",
         """
         [Trigger]
-        Type = File
+        Type = Path
         Operation = Remove
         Target = bin/foo
 
diff --git a/test/pacman/tests/hook-file-upgrade-nomatch.py b/test/pacman/tests/hook-file-upgrade-nomatch.py
index e984d376..891b8164 100644
--- a/test/pacman/tests/hook-file-upgrade-nomatch.py
+++ b/test/pacman/tests/hook-file-upgrade-nomatch.py
@@ -4,7 +4,7 @@ self.add_script("hook-script", ": > hook-output")
 self.add_hook("hook",
         """
         [Trigger]
-        Type = File
+        Type = Path
         Operation = Upgrade
         Target = bin/?*
 
diff --git a/test/pacman/tests/hook-target-list.py b/test/pacman/tests/hook-target-list.py
index 6dd6c4d8..b932c491 100644
--- a/test/pacman/tests/hook-target-list.py
+++ b/test/pacman/tests/hook-target-list.py
@@ -14,7 +14,7 @@ self.add_hook("hook",
         Target = foo
 
         [Trigger]
-        Type = File
+        Type = Path
         Operation = Install
         # matches files in 'file/' but not 'file/' itself
         Target = file/?*
diff --git a/test/pacman/tests/hook-type-reused.py b/test/pacman/tests/hook-type-reused.py
index 472c8caf..0ea1c0ba 100644
--- a/test/pacman/tests/hook-type-reused.py
+++ b/test/pacman/tests/hook-type-reused.py
@@ -4,7 +4,7 @@ self.add_hook("hook",
         """
         [Trigger]
         Type = Package
-        Type = File
+        Type = Path
         Operation = Install
         Target = foo
 
-- 
cgit v1.2.3-24-g4f1b