On Sun, 24 Apr 2022 22:17:17 +0200 Fabio Fantoni <fantonifa...@tiscali.it>
wrote:
I also prepared an NMU upload on mentors and open RFS:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009834
I sponsored this. NMU debdiff is attached.
diff -Nru backintime-1.2.1/CHANGES backintime-1.3.2/CHANGES
--- backintime-1.2.1/CHANGES 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/CHANGES 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,21 @@
Back In Time
+Version 1.3.2
+* Fix bug: Tests no longer work with Python 3.10
(https://github.com/bit-team/backintime/issues/1175)
+
+Version 1.3.1
+* bump version, forgot to push branch to Github before releasing
+
+Version 1.3.0
+* Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis
(https://github.com/bit-team/backintime/pull/1157)
+* Merge PR: qt/plugins/notifyplugin: Fix setting self.user, not local
variable, Thanks Zocker1999NET
(https://github.com/bit-team/backintime/pull/1155)
+* Merge PR: Use Link Color instead of lightGray as not to break theming,
Thanks newhinton (https://github.com/bit-team/backintime/pull/1153)
+* Merge PR: Match old and new rsync version format, Thanks TheTimeWalker
(https://github.com/bit-team/backintime/pull/1139)
+* Merge PR: 'TempPasswordThread' object has no attribute 'isAlive', Thanks
FMeinicke (https://github.com/bit-team/backintime/pull/1135)
+* Merge PR: Keep permissions of an existing mountpoint from being overridden,
Thanks bentolor (https://github.com/bit-team/backintime/pull/1058)
+* Fix bug: YEAR missing in config
(https://github.com/bit-team/backintime/issues/1023)
+* Fix bug: SSH module didn't send identification string while checking if
remote host is avilable (https://github.com/bit-team/backintime/issues/1030)
+
Version 1.2.1
* Fix bug: TypeError in backintime.py if mount failed while running a snapshot
(https://github.com/bit-team/backintime/issues/1005)
diff -Nru backintime-1.2.1/common/applicationinstance.py
backintime-1.3.2/common/applicationinstance.py
--- backintime-1.2.1/common/applicationinstance.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/applicationinstance.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/askpass.py backintime-1.3.2/common/askpass.py
--- backintime-1.2.1/common/askpass.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/askpass.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/backintime backintime-1.3.2/common/backintime
--- backintime-1.2.1/common/backintime 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/backintime 2022-03-12 14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/backintime-askpass
backintime-1.3.2/common/backintime-askpass
--- backintime-1.2.1/common/backintime-askpass 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/backintime-askpass 2022-03-12 14:33:53.000000000
+0100
@@ -1,7 +1,7 @@
#!/bin/sh
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/backintime.py
backintime-1.3.2/common/backintime.py
--- backintime-1.2.1/common/backintime.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/backintime.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/bcolors.py backintime-1.3.2/common/bcolors.py
--- backintime-1.2.1/common/bcolors.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/bcolors.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/cli.py backintime-1.3.2/common/cli.py
--- backintime-1.2.1/common/cli.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/cli.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Back In Time
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/configfile.py
backintime-1.3.2/common/configfile.py
--- backintime-1.2.1/common/configfile.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/configfile.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/config.py backintime-1.3.2/common/config.py
--- backintime-1.2.1/common/config.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/config.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@
class Config(configfile.ConfigFileWithProfiles):
APP_NAME = 'Back In Time'
- VERSION = '1.2.1'
- COPYRIGHT = 'Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard
Bailey, Germar Reitze'
+ VERSION = '1.3.2'
+ COPYRIGHT = 'Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard
Bailey, Germar Reitze'
CONFIG_VERSION = 6
NONE = 0
@@ -89,7 +89,8 @@
REPEATEDLY : _('Repeatedly (anacron)'),
UDEV : _('When drive get connected (udev)'),
WEEK : _('Every Week'),
- MONTH : _('Every Month')
+ MONTH : _('Every Month'),
+ YEAR : _('Every Year')
}
REMOVE_OLD_BACKUP_UNITS = {
@@ -1576,6 +1577,8 @@
cron_line = '%s %s * * %s {cmd}' %(minute, hour, weekday)
elif self.MONTH == backup_mode:
cron_line = '%s %s %s * * {cmd}' %(minute, hour, day)
+ elif self.YEAR == backup_mode:
+ cron_line = '%s %s 1 1 * {cmd}' %(minute, hour)
return cron_line
diff -Nru backintime-1.2.1/common/create-manpage-backintime-config.py
backintime-1.3.2/common/create-manpage-backintime-config.py
--- backintime-1.2.1/common/create-manpage-backintime-config.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/create-manpage-backintime-config.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/driveinfo.py
backintime-1.3.2/common/driveinfo.py
--- backintime-1.2.1/common/driveinfo.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/driveinfo.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/dummytools.py
backintime-1.3.2/common/dummytools.py
--- backintime-1.2.1/common/dummytools.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/dummytools.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/encfstools.py
backintime-1.3.2/common/encfstools.py
--- backintime-1.2.1/common/encfstools.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/encfstools.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack
+# Copyright (C) 2012-2022 Germar Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/exceptions.py
backintime-1.3.2/common/exceptions.py
--- backintime-1.2.1/common/exceptions.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/exceptions.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/guiapplicationinstance.py
backintime-1.3.2/common/guiapplicationinstance.py
--- backintime-1.2.1/common/guiapplicationinstance.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/guiapplicationinstance.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/logger.py backintime-1.3.2/common/logger.py
--- backintime-1.2.1/common/logger.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/logger.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/man/C/backintime.1
backintime-1.3.2/common/man/C/backintime.1
--- backintime-1.2.1/common/man/C/backintime.1 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/man/C/backintime.1 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-.TH backintime 1 "Aug 2016" "version 1.2.1" "USER COMMANDS"
+.TH backintime 1 "Aug 2016" "version 1.3.2" "USER COMMANDS"
.SH NAME
backintime \- a simple backup tool for Linux.
.PP
diff -Nru backintime-1.2.1/common/man/C/backintime-askpass.1
backintime-1.3.2/common/man/C/backintime-askpass.1
--- backintime-1.2.1/common/man/C/backintime-askpass.1 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/man/C/backintime-askpass.1 2022-03-12
14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-.TH backintime-askpass 1 "Jan 2015" "version 1.2.1" "USER COMMANDS"
+.TH backintime-askpass 1 "Jan 2015" "version 1.3.2" "USER COMMANDS"
.SH NAME
backintime-askpass \- a simple backup tool for Linux.
.PP
diff -Nru backintime-1.2.1/common/man/C/backintime-config.1
backintime-1.3.2/common/man/C/backintime-config.1
--- backintime-1.2.1/common/man/C/backintime-config.1 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/man/C/backintime-config.1 2022-03-12
14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-.TH backintime-config 1 "Nov 2017" "version 1.2.1" "USER COMMANDS"
+.TH backintime-config 1 "Nov 2017" "version 1.3.2" "USER COMMANDS"
.SH NAME
config \- BackInTime configuration files.
.SH SYNOPSIS
diff -Nru backintime-1.2.1/common/mount.py backintime-1.3.2/common/mount.py
--- backintime-1.2.1/common/mount.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/mount.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack
+# Copyright (C) 2012-2022 Germar Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -607,8 +607,11 @@
if os.path.ismount(self.currentMountpoint):
return True
else:
- if os.listdir(self.currentMountpoint):
- raise MountException(_('mountpoint %s not empty.') %
self.currentMountpoint)
+ try:
+ if os.listdir(self.currentMountpoint):
+ raise MountException(_('mountpoint %s not empty.') %
self.currentMountpoint)
+ except FileNotFoundError:
+ pass
return False
def createMountStructure(self):
@@ -648,7 +651,7 @@
"""
tools.mkdir(self.mount_root, 0o700)
tools.mkdir(self.hash_id_path, 0o700)
- tools.mkdir(self.currentMountpoint, 0o700)
+ tools.mkdir(self.currentMountpoint, 0o700, False)
tools.mkdir(self.lock_path, 0o700)
def mountProcessLockAcquire(self, timeout = 60):
diff -Nru backintime-1.2.1/common/password_ipc.py
backintime-1.3.2/common/password_ipc.py
--- backintime-1.2.1/common/password_ipc.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/password_ipc.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -132,7 +132,7 @@
def stop(self):
self.join(5)
- if self.isAlive():
+ if self.is_alive():
#threading does not support signal.alarm
self.read()
try:
diff -Nru backintime-1.2.1/common/password.py
backintime-1.3.2/common/password.py
--- backintime-1.2.1/common/password.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/password.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/pluginmanager.py
backintime-1.3.2/common/pluginmanager.py
--- backintime-1.2.1/common/pluginmanager.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/pluginmanager.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/plugins/usercallbackplugin.py
backintime-1.3.2/common/plugins/usercallbackplugin.py
--- backintime-1.2.1/common/plugins/usercallbackplugin.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/plugins/usercallbackplugin.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/po/README.md
backintime-1.3.2/common/po/README.md
--- backintime-1.2.1/common/po/README.md 1970-01-01 01:00:00.000000000
+0100
+++ backintime-1.3.2/common/po/README.md 2022-03-12 14:33:53.000000000
+0100
@@ -0,0 +1,4 @@
+Translation for BackInTime is done in
https://translations.launchpad.net/backintime
+
+Please do NOT change files in this folder as they will get overwritten with
files
+exported from Launchpad. Instead use Launchpad to modify translations.
diff -Nru backintime-1.2.1/common/progress.py
backintime-1.3.2/common/progress.py
--- backintime-1.2.1/common/progress.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/progress.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/snapshotlog.py
backintime-1.3.2/common/snapshotlog.py
--- backintime-1.2.1/common/snapshotlog.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/snapshotlog.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Germar Reitze
+# Copyright (C) 2016-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/snapshots.py
backintime-1.3.2/common/snapshots.py
--- backintime-1.2.1/common/snapshots.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/snapshots.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey,
Germar Reitze, Taylor Raack
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey,
Germar Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/sshMaxArg.py
backintime-1.3.2/common/sshMaxArg.py
--- backintime-1.2.1/common/sshMaxArg.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/sshMaxArg.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/sshtools.py
backintime-1.3.2/common/sshtools.py
--- backintime-1.2.1/common/sshtools.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/sshtools.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack
+# Copyright (C) 2012-2022 Germar Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -492,11 +492,13 @@
if not self.config.sshCheckPingHost(self.profile_id):
return
logger.debug('Check ping host', self)
+ versionString =
'SSH-2.0-backintime_{}\r\n'.format(self.config.VERSION).encode()
count = 0
while count < 5:
try:
with socket.create_connection((self.host, self.port), 2.0) as
s:
result = s.connect_ex(s.getpeername())
+ s.sendall(versionString)
except:
result = -1
if result == 0:
diff -Nru backintime-1.2.1/common/test/dummy_test_process.sh
backintime-1.3.2/common/test/dummy_test_process.sh
--- backintime-1.2.1/common/test/dummy_test_process.sh 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/dummy_test_process.sh 2022-03-12
14:33:53.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
# Back In Time
-# Copyright (C) 2016-2019 Germar Reitze
+# Copyright (C) 2016-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/generic.py
backintime-1.3.2/common/test/generic.py
--- backintime-1.2.1/common/test/generic.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/test/generic.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Germar Reitze
+# Copyright (C) 2016-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/__init__.py
backintime-1.3.2/common/test/__init__.py
--- backintime-1.2.1/common/test/__init__.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/test/__init__.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_applicationinstance.py
backintime-1.3.2/common/test/test_applicationinstance.py
--- backintime-1.2.1/common/test/test_applicationinstance.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_applicationinstance.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_argparser.py
backintime-1.3.2/common/test/test_argparser.py
--- backintime-1.2.1/common/test/test_argparser.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_argparser.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_backup.py
backintime-1.3.2/common/test/test_backup.py
--- backintime-1.2.1/common/test/test_backup.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/test/test_backup.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Germar Reitze
+# Copyright (C) 2016-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_configfile.py
backintime-1.3.2/common/test/test_configfile.py
--- backintime-1.2.1/common/test/test_configfile.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_configfile.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_encfstools.py
backintime-1.3.2/common/test/test_encfstools.py
--- backintime-1.2.1/common/test/test_encfstools.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_encfstools.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Taylor Raack, Germar Reitze
+# Copyright (C) 2016-2022 Taylor Raack, Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_restore.py
backintime-1.3.2/common/test/test_restore.py
--- backintime-1.2.1/common/test/test_restore.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_restore.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_sid.py
backintime-1.3.2/common/test/test_sid.py
--- backintime-1.2.1/common/test/test_sid.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/test/test_sid.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_snapshotlog.py
backintime-1.3.2/common/test/test_snapshotlog.py
--- backintime-1.2.1/common/test/test_snapshotlog.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_snapshotlog.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Germar Reitze
+# Copyright (C) 2016-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_snapshots.py
backintime-1.3.2/common/test/test_snapshots.py
--- backintime-1.2.1/common/test/test_snapshots.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_snapshots.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_sshtools.py
backintime-1.3.2/common/test/test_sshtools.py
--- backintime-1.2.1/common/test/test_sshtools.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_sshtools.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2016-2019 Taylor Raack, Germar Reitze
+# Copyright (C) 2016-2022 Taylor Raack, Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_takeSnapshot.py
backintime-1.3.2/common/test/test_takeSnapshot.py
--- backintime-1.2.1/common/test/test_takeSnapshot.py 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/common/test/test_takeSnapshot.py 2022-03-12
14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/test/test_tools.py
backintime-1.3.2/common/test/test_tools.py
--- backintime-1.2.1/common/test/test_tools.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/common/test/test_tools.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/common/tools.py backintime-1.3.2/common/tools.py
--- backintime-1.2.1/common/tools.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/common/tools.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,10 @@
import errno
import gzip
import tempfile
-import collections
+try:
+ from collections.abc import MutableSet
+except ImportError:
+ from collections import MutableSet
import hashlib
import ipaddress
import atexit
@@ -287,7 +290,7 @@
%(path, str(e)), traceDepth = 1)
return os.path.isdir(path)
-def mkdir(path, mode = 0o755):
+def mkdir(path, mode = 0o755, enforce_permissions = True):
"""
Create directory ``path``.
@@ -300,7 +303,8 @@
"""
if os.path.isdir(path):
try:
- os.chmod(path, mode)
+ if enforce_permissions:
+ os.chmod(path, mode)
except:
return False
return True
@@ -528,9 +532,12 @@
data = proc.communicate()[0]
caps = []
#rsync >= 3.1 does provide --info=progress2
- m = re.match(r'rsync\s*version\s*(\d\.\d)', data)
- if m and StrictVersion(m.group(1)) >= StrictVersion('3.1'):
- caps.append('progress2')
+ matchers = [r'rsync\s*version\s*(\d\.\d)',
r'rsync\s*version\s*v(\d\.\d.\d)']
+ for matcher in matchers:
+ m = re.match(matcher, data)
+ if m and StrictVersion(m.group(1)) >= StrictVersion('3.1'):
+ caps.append('progress2')
+ break
#all other capabilities are separated by ',' between
#'Capabilities:' and '\n\n'
@@ -1798,7 +1805,7 @@
self.history = [path,]
self.index = 0
-class OrderedSet(collections.MutableSet):
+class OrderedSet(MutableSet):
"""
OrderedSet from Python recipe
http://code.activestate.com/recipes/576694/
diff -Nru backintime-1.2.1/debian/changelog backintime-1.3.2/debian/changelog
--- backintime-1.2.1/debian/changelog 2021-05-31 15:14:50.000000000 +0200
+++ backintime-1.3.2/debian/changelog 2022-04-25 14:02:48.000000000 +0200
@@ -1,3 +1,14 @@
+backintime (1.3.2-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #1008653, #865744).
+ * d/watch: support also latest versions without initial v
+ (Closes: #1003776).
+ * Remove d/patches: applied upstream.
+ * Update d/copyright.
+
+ -- Fabio Fantoni <fantonifa...@tiscali.it> Mon, 25 Apr 2022 14:02:48 +0200
+
backintime (1.2.1-3) unstable; urgency=medium
* Cherry-pick patch for #946349 from upstream Git repository
diff -Nru backintime-1.2.1/debian/copyright backintime-1.3.2/debian/copyright
--- backintime-1.2.1/debian/copyright 2021-05-31 15:14:50.000000000 +0200
+++ backintime-1.3.2/debian/copyright 2022-04-25 14:02:48.000000000 +0200
@@ -3,11 +3,11 @@
Source: https://github.com/bit-team/backintime
Files: *
-Copyright: 2008-2019 Oprea Dan <d...@le-web.org>
- 2008-2019 Bart de Koning
- 2008-2019 Richard Bailey
- 2008-2019 Germar Reitze
- 2008-2019 Taylor Raack
+Copyright: 2008-2022 Oprea Dan <d...@le-web.org>
+ 2008-2022 Bart de Koning
+ 2008-2022 Richard Bailey
+ 2008-2022 Germar Reitze
+ 2008-2022 Taylor Raack
License: GPL-2+
Files: qt/serviceHelper.py
diff -Nru backintime-1.2.1/debian/patches/00-fix-946349.patch
backintime-1.3.2/debian/patches/00-fix-946349.patch
--- backintime-1.2.1/debian/patches/00-fix-946349.patch 2021-05-31
15:14:50.000000000 +0200
+++ backintime-1.3.2/debian/patches/00-fix-946349.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-Description: Cherry-pick fix for #946349 from upstream repository
-Origin: upstream,
https://github.com/bit-team/backintime/commit/7f6f570a01e7e0a623e670baaf63eaaf879948c4
-Bug: https://github.com/bit-team/backintime/issues/974
-Bug-Debian: https://bugs.debian.org/946349
-Last-Update: 2021-05-31
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/common/mount.py
-+++ b/common/mount.py
-@@ -648,7 +648,7 @@
- """
- tools.mkdir(self.mount_root, 0o700)
- tools.mkdir(self.hash_id_path, 0o700)
-- tools.mkdir(self.currentMountpoint, 0o700)
-+ tools.mkdir(self.currentMountpoint, 0o700, False)
- tools.mkdir(self.lock_path, 0o700)
-
- def mountProcessLockAcquire(self, timeout = 60):
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -287,7 +287,7 @@
- %(path, str(e)), traceDepth = 1)
- return os.path.isdir(path)
-
--def mkdir(path, mode = 0o755):
-+def mkdir(path, mode = 0o755, enforce_permissions = True):
- """
- Create directory ``path``.
-
-@@ -300,7 +300,8 @@
- """
- if os.path.isdir(path):
- try:
-- os.chmod(path, mode)
-+ if enforce_permissions:
-+ os.chmod(path, mode)
- except:
- return False
- return True
diff -Nru backintime-1.2.1/debian/patches/series
backintime-1.3.2/debian/patches/series
--- backintime-1.2.1/debian/patches/series 2021-05-31 15:14:50.000000000
+0200
+++ backintime-1.3.2/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-00-fix-946349.patch
diff -Nru backintime-1.2.1/debian/watch backintime-1.3.2/debian/watch
--- backintime-1.2.1/debian/watch 2021-05-31 15:14:50.000000000 +0200
+++ backintime-1.3.2/debian/watch 2022-04-25 14:02:48.000000000 +0200
@@ -1,2 +1,2 @@
version=4
-https://github.com/bit-team/backintime/releases
.*/v(\d\S*)/backintime-\1\.tar\.(?:gz|bz2|xz)
+https://github.com/bit-team/backintime/releases
.*/v?(\d\S*)/backintime-\1\.tar\.(?:gz|bz2|xz)
diff -Nru backintime-1.2.1/qt/app.py backintime-1.3.2/qt/app.py
--- backintime-1.2.1/qt/app.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/app.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: UTF-8 -*-
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/backintime-qt backintime-1.3.2/qt/backintime-qt
--- backintime-1.2.1/qt/backintime-qt 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/backintime-qt 2022-03-12 14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/docbook/en/index.docbook
backintime-1.3.2/qt/docbook/en/index.docbook
--- backintime-1.2.1/qt/docbook/en/index.docbook 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/docbook/en/index.docbook 2022-03-12
14:33:53.000000000 +0100
@@ -3,8 +3,8 @@
<!ENTITY legal SYSTEM "legal.xml">
<!ENTITY appname "Back In Time">
<!ENTITY app "<application>&appname;</application>">
-<!ENTITY appversion "1.2.1">
-<!ENTITY manrevision "1.2.1">
+<!ENTITY appversion "1.3.2">
+<!ENTITY manrevision "1.3.2">
<!ENTITY date "Juliy 2010">
]>
<!--
diff -Nru backintime-1.2.1/qt/icon.py backintime-1.3.2/qt/icon.py
--- backintime-1.2.1/qt/icon.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icon.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/icons/16x16/actions/show-hidden.svg
backintime-1.3.2/qt/icons/16x16/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/16x16/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/16x16/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/icons/22x22/actions/show-hidden.svg
backintime-1.3.2/qt/icons/22x22/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/22x22/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/22x22/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/icons/24x24/actions/show-hidden.svg
backintime-1.3.2/qt/icons/24x24/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/24x24/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/24x24/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/icons/32x32/actions/show-hidden.svg
backintime-1.3.2/qt/icons/32x32/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/32x32/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/32x32/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/icons/48x48/actions/show-hidden.svg
backintime-1.3.2/qt/icons/48x48/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/48x48/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/48x48/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/icons/scalable/actions/show-hidden.svg
backintime-1.3.2/qt/icons/scalable/actions/show-hidden.svg
--- backintime-1.2.1/qt/icons/scalable/actions/show-hidden.svg 2019-08-25
18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/icons/scalable/actions/show-hidden.svg 2022-03-12
14:33:53.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2015-2019 Germar Reitze -->
+<!-- Copyright (C) 2015-2022 Germar Reitze -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
diff -Nru backintime-1.2.1/qt/logviewdialog.py
backintime-1.3.2/qt/logviewdialog.py
--- backintime-1.2.1/qt/logviewdialog.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/logviewdialog.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/man/C/backintime-qt.1
backintime-1.3.2/qt/man/C/backintime-qt.1
--- backintime-1.2.1/qt/man/C/backintime-qt.1 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/man/C/backintime-qt.1 2022-03-12 14:33:53.000000000
+0100
@@ -1,4 +1,4 @@
-.TH backintime-qt 1 "Aug 2016" "version 1.2.1" "USER COMMANDS"
+.TH backintime-qt 1 "Aug 2016" "version 1.3.2" "USER COMMANDS"
.SH NAME
backintime-qt \- a simple backup tool.
.SH SYNOPSIS
diff -Nru backintime-1.2.1/qt/messagebox.py backintime-1.3.2/qt/messagebox.py
--- backintime-1.2.1/qt/messagebox.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/messagebox.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Germar Reitze
+# Copyright (C) 2012-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/plugins/notifyplugin.py
backintime-1.3.2/qt/plugins/notifyplugin.py
--- backintime-1.2.1/qt/plugins/notifyplugin.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/plugins/notifyplugin.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,13 +32,13 @@
if not self.user:
try:
- user = os.environ['USER']
+ self.user = os.environ['USER']
except:
pass
if not self.user:
try:
- user = os.environ['LOGNAME']
+ self.user = os.environ['LOGNAME']
except:
pass
diff -Nru backintime-1.2.1/qt/plugins/qt4plugin.py
backintime-1.3.2/qt/plugins/qt4plugin.py
--- backintime-1.2.1/qt/plugins/qt4plugin.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/plugins/qt4plugin.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/qtsystrayicon.py
backintime-1.3.2/qt/qtsystrayicon.py
--- backintime-1.2.1/qt/qtsystrayicon.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/qtsystrayicon.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/qttools.py backintime-1.3.2/qt/qttools.py
--- backintime-1.2.1/qt/qttools.py 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/qt/qttools.py 2022-03-12 14:33:53.000000000 +0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/restoredialog.py
backintime-1.3.2/qt/restoredialog.py
--- backintime-1.2.1/qt/restoredialog.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/restoredialog.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/serviceHelper.py
backintime-1.3.2/qt/serviceHelper.py
--- backintime-1.2.1/qt/serviceHelper.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/serviceHelper.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# (from BackInTime)
-# Copyright (C) 2015-2019 Germar Reitze
+# Copyright (C) 2015-2022 Germar Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/qt/settingsdialog.py
backintime-1.3.2/qt/settingsdialog.py
--- backintime-1.2.1/qt/settingsdialog.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/settingsdialog.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -1707,7 +1707,7 @@
def formatExcludeItem(self, item):
if self.mode == 'ssh_encfs' and
tools.patternHasNotEncryptableWildcard(item.text(0)):
item.setIcon(0, self.icon.INVALID_EXCLUDE)
- item.setBackground(0, QBrush(Qt.lightGray))
+ item.setBackground(0, QPalette().brush(QPalette.Active,
QPalette.Link))
elif item.text(0) in self.config.DEFAULT_EXCLUDE:
item.setIcon(0, self.icon.DEFAULT_EXCLUDE)
item.setBackground(0, QBrush())
diff -Nru backintime-1.2.1/qt/snapshotsdialog.py
backintime-1.3.2/qt/snapshotsdialog.py
--- backintime-1.2.1/qt/snapshotsdialog.py 2019-08-25 18:26:54.000000000
+0200
+++ backintime-1.3.2/qt/snapshotsdialog.py 2022-03-12 14:33:53.000000000
+0100
@@ -1,5 +1,5 @@
# Back In Time
-# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
+# Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -Nru backintime-1.2.1/README.md backintime-1.3.2/README.md
--- backintime-1.2.1/README.md 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/README.md 2022-03-12 14:33:53.000000000 +0100
@@ -1,6 +1,6 @@
# Back In Time
-Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
+Copyright (C) 2008-2022 Oprea Dan, Bart de Koning, Richard Bailey, Germar
Reitze, Taylor Raack
[](https://travis-ci.org/bit-team/backintime)
[](https://coveralls.io/github/bit-team/backintime?branch=master)
@@ -15,7 +15,7 @@
You only need to specify 3 things:
* where to save snapshots
-* what folders to backup
+* what folders to back up
* backup frequency (manual, every hour, every day, every month)
## Documentation
diff -Nru backintime-1.2.1/VERSION backintime-1.3.2/VERSION
--- backintime-1.2.1/VERSION 2019-08-25 18:26:54.000000000 +0200
+++ backintime-1.3.2/VERSION 2022-03-12 14:33:53.000000000 +0100
@@ -1 +1 @@
-1.2.1
+1.3.2
