Hello community, here is the log from the commit of package backup-manager for openSUSE:Factory checked in at Mon Jan 19 01:44:03 CET 2009. -------- --- GNOME/backup-manager/backup-manager.changes 2009-01-07 20:16:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/backup-manager/backup-manager.changes 2009-01-15 21:40:27.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 15 15:40:30 EST 2009 - crivera@suse.de + +- Make sure that the backup path doesn't start with a /, + handle the case where src and dest dirs are symlinks, + and clear saved file selections if we're restoring + everything. This fixes bnc#465883. +- Make the Select Files window modal. This fixes bnc#465897 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ backup-manager.spec ++++++ --- /var/tmp/diff_new_pack.F21987/_old 2009-01-19 01:43:51.000000000 +0100 +++ /var/tmp/diff_new_pack.F21987/_new 2009-01-19 01:43:51.000000000 +0100 @@ -25,7 +25,7 @@ Requires: python >= 2.6 python-gtk python-setuptools rdiff-backup PolicyKit dbus-1 dbus-1-python libnotify tango-icon-theme AutoReqProv: on Version: 0.1.0 -Release: 16 +Release: 18 Summary: A simple backup application for GNOME Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,6 +84,12 @@ %files lang -f backup_manager.lang %changelog +* Thu Jan 15 2009 crivera@suse.de +- Make sure that the backup path doesn't start with a /, + handle the case where src and dest dirs are symlinks, + and clear saved file selections if we're restoring + everything. This fixes bnc#465883. +- Make the Select Files window modal. This fixes bnc#465897 * Wed Jan 07 2009 crivera@suse.de - Improve searching for files in backup-manager-restore. It's now possible to restore files that have been deleted. ++++++ backup-manager-0.1.0.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/backup.glade new/backup-manager-0.1.0/backup_manager/backup.glade --- old/backup-manager-0.1.0/backup_manager/backup.glade 2008-12-15 06:54:27.000000000 +0100 +++ new/backup-manager-0.1.0/backup_manager/backup.glade 2008-12-18 09:53:42.000000000 +0100 @@ -372,6 +372,7 @@ <widget class="GtkWindow" id="restore_files_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Select Files to Restore</property> + <property name="modal">True</property> <property name="window_position">GTK_WIN_POS_CENTER</property> <property name="default_width">500</property> <property name="default_height">300</property> @@ -923,6 +924,7 @@ <widget class="GtkWindow" id="select_files_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Select Files to Backup</property> + <property name="modal">True</property> <property name="window_position">GTK_WIN_POS_CENTER</property> <property name="default_width">500</property> <property name="default_height">300</property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/core.py new/backup-manager-0.1.0/backup_manager/core.py --- old/backup-manager-0.1.0/backup_manager/core.py 2008-12-15 06:26:17.000000000 +0100 +++ new/backup-manager-0.1.0/backup_manager/core.py 2008-12-18 09:54:16.000000000 +0100 @@ -332,6 +332,8 @@ else: i = string.find (path, mp) config.backup_path = path[i + len (mp):] + if config.backup_path.startswith ("/"): + config.backup_path = config.backup_path[1:] config.device_uuid = uuid_from_device (dev) config.remove ("fuse_type") config.remove ("fuse_name") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/rdiff.py new/backup-manager-0.1.0/backup_manager/rdiff.py --- old/backup-manager-0.1.0/backup_manager/rdiff.py 2008-12-15 07:09:42.000000000 +0100 +++ new/backup-manager-0.1.0/backup_manager/rdiff.py 2008-12-18 09:54:47.000000000 +0100 @@ -80,8 +80,8 @@ path = get_backup_path (config) hd = pwd.getpwuid (os.getuid ())[5] - hd_mp, hd_dev, hd_type = get_mount_info (hd) - bp_mp, bp_dev, bp_type = get_mount_info (path) + hd_mp, hd_dev, hd_type = get_mount_info (os.path.realpath (hd)) + bp_mp, bp_dev, bp_type = get_mount_info (os.path.realpath (path)) if hd_mp == None: raise BackupManagerException (_("Unable to get mount point for %s") % hd) @@ -98,7 +98,7 @@ if not os.path.exists (os.path.join (hd, "rdiff-backup-data")): dest_info = os.statvfs (path) dest_size = dest_info[F_BAVAIL] * dest_info[F_FRSIZE] / 1048576 - if config.all_files: + if config.file_selection == "all": src_size = get_directory_size (hd) else: src_size = get_includes_size (config) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/settings.py new/backup-manager-0.1.0/backup_manager/settings.py --- old/backup-manager-0.1.0/backup_manager/settings.py 2008-11-21 01:57:49.000000000 +0100 +++ new/backup-manager-0.1.0/backup_manager/settings.py 2008-12-18 09:43:43.000000000 +0100 @@ -210,12 +210,13 @@ self._ampm_combo.get_active_text ()) self._config.includes = [] self._config.excludes = [] - - for row in self._files_mdl: - self._config.includes.append (row[0]) - for row in self._exceptions_mdl: - self._config.excludes.append (row[0]) + if self._config.file_selection == "specific": + for row in self._files_mdl: + self._config.includes.append (row[0]) + + for row in self._exceptions_mdl: + self._config.excludes.append (row[0]) if self._config.backup_schedule != SCHEDULE_NEVER: self._window.set_title (_("Checking disk space...")) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt new/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt --- old/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt 2008-12-15 07:10:36.000000000 +0100 +++ new/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt 2008-12-18 10:10:59.000000000 +0100 @@ -2,6 +2,7 @@ MANIFEST.in backup-manager.spec build-catalogs.sh +make-rpm.sh setup.cfg setup.py backup_manager/__init__.py diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/make-rpm.sh new/backup-manager-0.1.0/make-rpm.sh --- old/backup-manager-0.1.0/make-rpm.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/backup-manager-0.1.0/make-rpm.sh 2008-12-06 07:14:12.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh + +python setup.py sdist && sudo cp dist/backup-manager-*.tar.gz /usr/src/packages/SOURCES && sudo cp backup-manager.spec /usr/src/packages/SPECS && sudo rpmbuild -ba /usr/src/packages/SPECS/backup-manager.spec && sudo rpm -Uvh --force /usr/src/packages/RPMS/i586/backup-manager-*.i586.rpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org