summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2022-07-04 09:18:15 +0000
committerPMR <pmr@pmr-lander>2022-07-04 09:18:15 +0000
commit7d989f05e37b6b46b4858da49a4bb2712fa5b665 (patch)
tree0c8666074ca5f3e176a5a33d2ad63717a32c438a
parent09dac23b3b52ba730137020ce2cee7ee11b4af56 (diff)
parent34e50515acedbb03af4334850c4e769fb6ec2777 (diff)
record new upstream branch created by importing plainbox-provider-checkbox_0.65.0~rc3.orig.tar.gz and merge it
-rwxr-xr-xbin/removable_storage_watcher.py4
-rw-r--r--debian/.git-dpm14
-rwxr-xr-xmanage.py2
3 files changed, 12 insertions, 8 deletions
diff --git a/bin/removable_storage_watcher.py b/bin/removable_storage_watcher.py
index 7208954..988abc3 100755
--- a/bin/removable_storage_watcher.py
+++ b/bin/removable_storage_watcher.py
@@ -948,6 +948,10 @@ def main():
else:
print("\n\n{} NOW\n\n".format(args.action.upper()), flush=True)
+ try:
+ return listener.check(args.timeout)
+ except KeyboardInterrupt:
+ return 1
if __name__ == "__main__":
diff --git a/debian/.git-dpm b/debian/.git-dpm
index ed49d04..6e04f9b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-654fbd83424e790b8992563889e23f6db3ecea6e
-654fbd83424e790b8992563889e23f6db3ecea6e
-654fbd83424e790b8992563889e23f6db3ecea6e
-654fbd83424e790b8992563889e23f6db3ecea6e
-plainbox-provider-checkbox_0.65.0~rc2.orig.tar.gz
-60b753152697a3c84af657e70c60c8208bb2cc45
-1843028
+34e50515acedbb03af4334850c4e769fb6ec2777
+34e50515acedbb03af4334850c4e769fb6ec2777
+34e50515acedbb03af4334850c4e769fb6ec2777
+34e50515acedbb03af4334850c4e769fb6ec2777
+plainbox-provider-checkbox_0.65.0~rc3.orig.tar.gz
+e55beee3317b7dc332f6289da24bd94f124be1ec
+1842870
diff --git a/manage.py b/manage.py
index 7f22a8f..bfea3dd 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
setup(
name='plainbox-provider-checkbox',
namespace='com.canonical.certification',
- version="0.65.0rc2",
+ version="0.65.0rc3",
description=N_("Checkbox provider"),
gettext_domain='plainbox-provider-checkbox',
strict=False, deprecated=False,