Hello community, here is the log from the commit of package backintime for openSUSE:Factory checked in at 2014-01-29 07:12:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/backintime (Old) and /work/SRC/openSUSE:Factory/.backintime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "backintime" Changes: -------- --- /work/SRC/openSUSE:Factory/backintime/backintime.changes 2014-01-03 14:49:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.backintime.new/backintime.changes 2014-01-29 07:12:27.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 20 11:01:26 UTC 2014 - [email protected] + +- added backintime-ssh-agent_only_if_password.patch, does not connect + ssh-agent if password isn't set. Allow passwordless ssh-key as root. + +------------------------------------------------------------------- New: ---- backintime-ssh-agent_only_if_password.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ backintime.spec ++++++ --- /var/tmp/diff_new_pack.OrfNPX/_old 2014-01-29 07:12:28.000000000 +0100 +++ /var/tmp/diff_new_pack.OrfNPX/_new 2014-01-29 07:12:28.000000000 +0100 @@ -27,6 +27,9 @@ BuildArch: noarch Source0: http://www.le-web.org/download/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.png +# PATCH-FEATURE-OPENSUSE %{name}-ssh-agent_only_if_password.patch -- [email protected] +Patch0: %{name}-ssh-agent_only_if_password.patch + BuildRequires: cron BuildRequires: fdupes BuildRequires: gnome-session @@ -129,6 +132,7 @@ %lang_package %prep %setup -q -c +%patch0 -p1 %build sed -i -e "s|/share/doc/backintime|/share/doc/packages/backintime|g" common/config.py */Makefile.template ++++++ backintime-ssh-agent_only_if_password.patch ++++++ --- backintime-1.0.34/common/sshtools.py 2013-12-12 10:34:10.000000000 +0100 +++ backintime-1.0.34.kai/common/sshtools.py 2014-01-18 13:44:28.478332639 +0100 @@ -86,8 +86,10 @@ self.ssh_options += ['-o', 'ServerAliveInterval=240'] self.log_command = '%s: %s' % (self.mode, self.user_host_path) - self.unlock_ssh_agent() - + # ssh without password makes only sense if you have enabled passwordless ssh keys. In this case there is no need to use the keyring at all + if not self.password == None: + self.unlock_ssh_agent() + def _mount(self): """mount the service""" sshfs = ['sshfs'] + self.ssh_options -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
