Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package backintime for openSUSE:Factory checked in at 2021-07-13 22:37:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/backintime (Old) and /work/SRC/openSUSE:Factory/.backintime.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "backintime" Tue Jul 13 22:37:07 2021 rev:23 rq:905977 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/backintime/backintime.changes 2019-11-06 13:53:40.087997869 +0100 +++ /work/SRC/openSUSE:Factory/.backintime.new.2625/backintime.changes 2021-07-13 22:37:33.458069378 +0200 @@ -1,0 +2,13 @@ +Wed Jul 7 10:29:53 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 1.3.1 + * Match old and new rsync version format + * Keep permissions of an existing mountpoint from being overridden + * Fix FileNotFoundError exception in mount.mounted + * Fix: 'TempPasswordThread' object has no attribute 'isAlive' + * Fix: YEAR missing in config + * Fix: SSH module didn't send identification string while checking if remote host is avilable (#1030) + * QT: Fix notifyplugin + * QT: Fix theming: Use link Color instead of hardcoded lightGray + +------------------------------------------------------------------- Old: ---- backintime-1.2.1.tar.gz backintime-1.2.1.tar.gz.asc New: ---- backintime-1.3.1.tar.gz backintime-1.3.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ backintime.spec ++++++ --- /var/tmp/diff_new_pack.nM1Ttx/_old 2021-07-13 22:37:34.054064578 +0200 +++ /var/tmp/diff_new_pack.nM1Ttx/_new 2021-07-13 22:37:34.058064545 +0200 @@ -1,7 +1,7 @@ # # spec file for package backintime # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: backintime -Version: 1.2.1 +Version: 1.3.1 Release: 0 Summary: Backup tool for Linux inspired by the "flyback project" License: GPL-2.0-or-later -Url: https://github.com/bit-team/backintime -Source0: https://github.com/bit-team/backintime/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/bit-team/backintime/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc +URL: https://github.com/bit-team/backintime +Source0: https://github.com/bit-team/backintime/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/bit-team/backintime/releases/download/%{version}/%{name}-%{version}.tar.gz.asc # Public key mentioned in https://github.com/bit-team/backintime#archlinux Source2: %{name}.keyring Source3: %{name}.png @@ -84,8 +84,7 @@ sed -i -e "s|backintime-common|backintime|g" common/configure qt/configure # Fix icon name. -sed -i 's/Icon=document-save/Icon=backintime/g' qt/backintime-qt.desktop -sed -i 's/Icon=document-save/Icon=backintime/g' qt/backintime-qt-root.desktop +sed -i 's/Icon=document-save/Icon=backintime/g' qt/backintime-qt.desktop qt/backintime-qt-root.desktop # Fix shebangs sed -i 's|/usr/bin/env python|#!/usr/bin/python|g' common/askpass.py @@ -141,11 +140,6 @@ %exclude %{_datadir}/%{name}/plugins %files lang -f %{name}.lang -%defattr(-,root,root) -%if 0%{?suse_version} < 1120 -%lang(jv) %dir %{_datadir}/locale/jv -%lang(jv) %dir %{_datadir}/locale/jv/LC_MESSAGES -%endif %files qt %defattr(-,root,root) ++++++ backintime-1.2.1.tar.gz -> backintime-1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/CHANGES new/backintime-1.3.1/CHANGES --- old/backintime-1.2.1/CHANGES 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/CHANGES 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,18 @@ Back In Time +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/README.md new/backintime-1.3.1/README.md --- old/backintime-1.2.1/README.md 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/README.md 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/VERSION new/backintime-1.3.1/VERSION --- old/backintime-1.2.1/VERSION 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/VERSION 2021-07-05 16:45:51.000000000 +0200 @@ -1 +1 @@ -1.2.1 +1.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/applicationinstance.py new/backintime-1.3.1/common/applicationinstance.py --- old/backintime-1.2.1/common/applicationinstance.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/applicationinstance.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/askpass.py new/backintime-1.3.1/common/askpass.py --- old/backintime-1.2.1/common/askpass.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/askpass.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/backintime new/backintime-1.3.1/common/backintime --- old/backintime-1.2.1/common/backintime 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/backintime 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/backintime-askpass new/backintime-1.3.1/common/backintime-askpass --- old/backintime-1.2.1/common/backintime-askpass 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/backintime-askpass 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/backintime.py new/backintime-1.3.1/common/backintime.py --- old/backintime-1.2.1/common/backintime.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/backintime.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/bcolors.py new/backintime-1.3.1/common/bcolors.py --- old/backintime-1.2.1/common/bcolors.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/bcolors.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/cli.py new/backintime-1.3.1/common/cli.py --- old/backintime-1.2.1/common/cli.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/cli.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Back In Time -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/config.py new/backintime-1.3.1/common/config.py --- old/backintime-1.2.1/common/config.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/config.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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.1' + COPYRIGHT = 'Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/configfile.py new/backintime-1.3.1/common/configfile.py --- old/backintime-1.2.1/common/configfile.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/configfile.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/create-manpage-backintime-config.py new/backintime-1.3.1/common/create-manpage-backintime-config.py --- old/backintime-1.2.1/common/create-manpage-backintime-config.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/create-manpage-backintime-config.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/driveinfo.py new/backintime-1.3.1/common/driveinfo.py --- old/backintime-1.2.1/common/driveinfo.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/driveinfo.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/dummytools.py new/backintime-1.3.1/common/dummytools.py --- old/backintime-1.2.1/common/dummytools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/dummytools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/encfstools.py new/backintime-1.3.1/common/encfstools.py --- old/backintime-1.2.1/common/encfstools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/encfstools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/exceptions.py new/backintime-1.3.1/common/exceptions.py --- old/backintime-1.2.1/common/exceptions.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/exceptions.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/guiapplicationinstance.py new/backintime-1.3.1/common/guiapplicationinstance.py --- old/backintime-1.2.1/common/guiapplicationinstance.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/guiapplicationinstance.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/logger.py new/backintime-1.3.1/common/logger.py --- old/backintime-1.2.1/common/logger.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/logger.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/man/C/backintime-askpass.1 new/backintime-1.3.1/common/man/C/backintime-askpass.1 --- old/backintime-1.2.1/common/man/C/backintime-askpass.1 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/man/C/backintime-askpass.1 2021-07-05 16:45:51.000000000 +0200 @@ -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.1" "USER COMMANDS" .SH NAME backintime-askpass \- a simple backup tool for Linux. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/man/C/backintime-config.1 new/backintime-1.3.1/common/man/C/backintime-config.1 --- old/backintime-1.2.1/common/man/C/backintime-config.1 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/man/C/backintime-config.1 2021-07-05 16:45:51.000000000 +0200 @@ -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.1" "USER COMMANDS" .SH NAME config \- BackInTime configuration files. .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/man/C/backintime.1 new/backintime-1.3.1/common/man/C/backintime.1 --- old/backintime-1.2.1/common/man/C/backintime.1 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/man/C/backintime.1 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -.TH backintime 1 "Aug 2016" "version 1.2.1" "USER COMMANDS" +.TH backintime 1 "Aug 2016" "version 1.3.1" "USER COMMANDS" .SH NAME backintime \- a simple backup tool for Linux. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/mount.py new/backintime-1.3.1/common/mount.py --- old/backintime-1.2.1/common/mount.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/mount.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/password.py new/backintime-1.3.1/common/password.py --- old/backintime-1.2.1/common/password.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/password.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/password_ipc.py new/backintime-1.3.1/common/password_ipc.py --- old/backintime-1.2.1/common/password_ipc.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/password_ipc.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/pluginmanager.py new/backintime-1.3.1/common/pluginmanager.py --- old/backintime-1.2.1/common/pluginmanager.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/pluginmanager.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/plugins/usercallbackplugin.py new/backintime-1.3.1/common/plugins/usercallbackplugin.py --- old/backintime-1.2.1/common/plugins/usercallbackplugin.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/plugins/usercallbackplugin.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/po/README.md new/backintime-1.3.1/common/po/README.md --- old/backintime-1.2.1/common/po/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/backintime-1.3.1/common/po/README.md 2021-07-05 16:45:51.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/progress.py new/backintime-1.3.1/common/progress.py --- old/backintime-1.2.1/common/progress.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/progress.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/snapshotlog.py new/backintime-1.3.1/common/snapshotlog.py --- old/backintime-1.2.1/common/snapshotlog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/snapshotlog.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/snapshots.py new/backintime-1.3.1/common/snapshots.py --- old/backintime-1.2.1/common/snapshots.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/snapshots.py 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/sshMaxArg.py new/backintime-1.3.1/common/sshMaxArg.py --- old/backintime-1.2.1/common/sshMaxArg.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/sshMaxArg.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/sshtools.py new/backintime-1.3.1/common/sshtools.py --- old/backintime-1.2.1/common/sshtools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/sshtools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze, Taylor Raack +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/__init__.py new/backintime-1.3.1/common/test/__init__.py --- old/backintime-1.2.1/common/test/__init__.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/__init__.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/dummy_test_process.sh new/backintime-1.3.1/common/test/dummy_test_process.sh --- old/backintime-1.2.1/common/test/dummy_test_process.sh 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/dummy_test_process.sh 2021-07-05 16:45:51.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # Back In Time -# Copyright (C) 2016-2019 Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/generic.py new/backintime-1.3.1/common/test/generic.py --- old/backintime-1.2.1/common/test/generic.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/generic.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_applicationinstance.py new/backintime-1.3.1/common/test/test_applicationinstance.py --- old/backintime-1.2.1/common/test/test_applicationinstance.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_applicationinstance.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_argparser.py new/backintime-1.3.1/common/test/test_argparser.py --- old/backintime-1.2.1/common/test/test_argparser.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_argparser.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_backup.py new/backintime-1.3.1/common/test/test_backup.py --- old/backintime-1.2.1/common/test/test_backup.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_backup.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_configfile.py new/backintime-1.3.1/common/test/test_configfile.py --- old/backintime-1.2.1/common/test/test_configfile.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_configfile.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_encfstools.py new/backintime-1.3.1/common/test/test_encfstools.py --- old/backintime-1.2.1/common/test/test_encfstools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_encfstools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Taylor Raack, Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_restore.py new/backintime-1.3.1/common/test/test_restore.py --- old/backintime-1.2.1/common/test/test_restore.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_restore.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_sid.py new/backintime-1.3.1/common/test/test_sid.py --- old/backintime-1.2.1/common/test/test_sid.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_sid.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_snapshotlog.py new/backintime-1.3.1/common/test/test_snapshotlog.py --- old/backintime-1.2.1/common/test/test_snapshotlog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_snapshotlog.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_snapshots.py new/backintime-1.3.1/common/test/test_snapshots.py --- old/backintime-1.2.1/common/test/test_snapshots.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_snapshots.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_sshtools.py new/backintime-1.3.1/common/test/test_sshtools.py --- old/backintime-1.2.1/common/test/test_sshtools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_sshtools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2016-2019 Taylor Raack, Germar Reitze +# Copyright (C) 2016-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_takeSnapshot.py new/backintime-1.3.1/common/test/test_takeSnapshot.py --- old/backintime-1.2.1/common/test/test_takeSnapshot.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_takeSnapshot.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/test/test_tools.py new/backintime-1.3.1/common/test/test_tools.py --- old/backintime-1.2.1/common/test/test_tools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/test/test_tools.py 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/common/tools.py new/backintime-1.3.1/common/tools.py --- old/backintime-1.2.1/common/tools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/common/tools.py 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 @@ -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 @@ -528,9 +529,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' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/debian/changelog new/backintime-1.3.1/debian/changelog --- old/backintime-1.2.1/debian/changelog 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/debian/changelog 2021-07-05 16:45:51.000000000 +0200 @@ -1,3 +1,3 @@ -backintime (1.2.1) unstable; urgency=low - * Fix bug: TypeError in backintime.py if mount failed while running a snapshot (https://github.com/bit-team/backintime/issues/1005) - -- Germar Reitze <germar.rei...@gmail.com> Sun, 25 Aug 2019 18:10:34 +0200 +backintime (1.3.1) unstable; urgency=low + * bump version, forgot to push branch to Github before releasing + -- Germar Reitze <germar.rei...@gmail.com> Mon, 05 Jul 2021 16:43:22 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/debian/copyright new/backintime-1.3.1/debian/copyright --- old/backintime-1.2.1/debian/copyright 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/debian/copyright 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ Back In Time -Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +Copyright (C) 2008-2021 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze A copy of the license can be found: /usr/share/common-licenses/GPL-2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/app.py new/backintime-1.3.1/qt/app.py --- old/backintime-1.2.1/qt/app.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/app.py 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/backintime-qt new/backintime-1.3.1/qt/backintime-qt --- old/backintime-1.2.1/qt/backintime-qt 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/backintime-qt 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/docbook/en/index.docbook new/backintime-1.3.1/qt/docbook/en/index.docbook --- old/backintime-1.2.1/qt/docbook/en/index.docbook 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/docbook/en/index.docbook 2021-07-05 16:45:51.000000000 +0200 @@ -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.1"> +<!ENTITY manrevision "1.3.1"> <!ENTITY date "Juliy 2010"> ]> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icon.py new/backintime-1.3.1/qt/icon.py --- old/backintime-1.2.1/qt/icon.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icon.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/16x16/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/16x16/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/16x16/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/16x16/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/22x22/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/22x22/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/22x22/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/22x22/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/24x24/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/24x24/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/24x24/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/24x24/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/32x32/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/32x32/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/32x32/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/32x32/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/48x48/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/48x48/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/48x48/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/48x48/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/icons/scalable/actions/show-hidden.svg new/backintime-1.3.1/qt/icons/scalable/actions/show-hidden.svg --- old/backintime-1.2.1/qt/icons/scalable/actions/show-hidden.svg 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/icons/scalable/actions/show-hidden.svg 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 Germar Reitze --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/logviewdialog.py new/backintime-1.3.1/qt/logviewdialog.py --- old/backintime-1.2.1/qt/logviewdialog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/logviewdialog.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/man/C/backintime-qt.1 new/backintime-1.3.1/qt/man/C/backintime-qt.1 --- old/backintime-1.2.1/qt/man/C/backintime-qt.1 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/man/C/backintime-qt.1 2021-07-05 16:45:51.000000000 +0200 @@ -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.1" "USER COMMANDS" .SH NAME backintime-qt \- a simple backup tool. .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/messagebox.py new/backintime-1.3.1/qt/messagebox.py --- old/backintime-1.2.1/qt/messagebox.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/messagebox.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 Germar Reitze +# Copyright (C) 2012-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/plugins/notifyplugin.py new/backintime-1.3.1/qt/plugins/notifyplugin.py --- old/backintime-1.2.1/qt/plugins/notifyplugin.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/plugins/notifyplugin.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/plugins/qt4plugin.py new/backintime-1.3.1/qt/plugins/qt4plugin.py --- old/backintime-1.2.1/qt/plugins/qt4plugin.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/plugins/qt4plugin.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/qtsystrayicon.py new/backintime-1.3.1/qt/qtsystrayicon.py --- old/backintime-1.2.1/qt/qtsystrayicon.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/qtsystrayicon.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/qttools.py new/backintime-1.3.1/qt/qttools.py --- old/backintime-1.2.1/qt/qttools.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/qttools.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/restoredialog.py new/backintime-1.3.1/qt/restoredialog.py --- old/backintime-1.2.1/qt/restoredialog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/restoredialog.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/serviceHelper.py new/backintime-1.3.1/qt/serviceHelper.py --- old/backintime-1.2.1/qt/serviceHelper.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/serviceHelper.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # (from BackInTime) -# Copyright (C) 2015-2019 Germar Reitze +# Copyright (C) 2015-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/settingsdialog.py new/backintime-1.3.1/qt/settingsdialog.py --- old/backintime-1.2.1/qt/settingsdialog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/settingsdialog.py 2021-07-05 16:45:51.000000000 +0200 @@ -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-2021 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backintime-1.2.1/qt/snapshotsdialog.py new/backintime-1.3.1/qt/snapshotsdialog.py --- old/backintime-1.2.1/qt/snapshotsdialog.py 2019-08-25 18:26:54.000000000 +0200 +++ new/backintime-1.3.1/qt/snapshotsdialog.py 2021-07-05 16:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # Back In Time -# Copyright (C) 2008-2019 Oprea Dan, Bart de Koning, Richard Bailey, Germar Reitze +# Copyright (C) 2008-2021 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
