Hello community, here is the log from the commit of package vorta for openSUSE:Factory checked in at 2019-11-22 10:27:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vorta (Old) and /work/SRC/openSUSE:Factory/.vorta.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vorta" Fri Nov 22 10:27:35 2019 rev:6 rq:750137 version:0.6.23 Changes: -------- --- /work/SRC/openSUSE:Factory/vorta/vorta.changes 2019-11-09 23:22:31.295708586 +0100 +++ /work/SRC/openSUSE:Factory/.vorta.new.26869/vorta.changes 2019-11-22 10:27:38.677234266 +0100 @@ -1,0 +2,9 @@ +Thu Oct 31 10:22:25 UTC 2019 - Antonio Larrosa <[email protected]> + +- Update to version 0.6.23 + * Move setting prune options to right place. Fixes gh#borgbase/vorta#339 + * Improvements to diff-feature. + * Enable sorting of archive table columns. + * Always mount with current user and read-only permissions + +------------------------------------------------------------------- Old: ---- v0.6.22.tar.gz New: ---- v0.6.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vorta.spec ++++++ --- /var/tmp/diff_new_pack.34GN53/_old 2019-11-22 10:27:39.157234125 +0100 +++ /var/tmp/diff_new_pack.34GN53/_new 2019-11-22 10:27:39.161234124 +0100 @@ -17,7 +17,7 @@ Name: vorta -Version: 0.6.22 +Version: 0.6.23 Release: 0 Summary: Desktop Backup Client based on BorgBackup License: GPL-3.0-only ++++++ v0.6.22.tar.gz -> v0.6.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/.bumpversion.cfg new/vorta-0.6.23/.bumpversion.cfg --- old/vorta-0.6.22/.bumpversion.cfg 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/.bumpversion.cfg 2019-10-10 07:17:37.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.22 +current_version = 0.6.23 tag = True [bumpversion:file:Makefile] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/Makefile new/vorta-0.6.23/Makefile --- old/vorta-0.6.22/Makefile 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/Makefile 2019-10-10 07:17:37.000000000 +0200 @@ -11,6 +11,8 @@ Vorta.app: translations-to-qm pyinstaller --clean --noconfirm vorta.spec + cp -R bin/darwin/Sparkle.framework dist/Vorta.app/Contents/Frameworks/ + cd dist; codesign --deep --sign 'Developer ID Application: Manuel Riel (CNMSCAXT48)' Vorta.app Vorta.dmg-Vagrant: vagrant up darwin64 @@ -19,15 +21,14 @@ vagrant halt darwin64 cp -R bin/darwin/Sparkle.framework dist/Vorta.app/Contents/Frameworks/ cd dist; codesign --deep --sign 'Developer ID Application: Manuel Riel (CNMSCAXT48)' Vorta.app - sleep 2; appdmg appdmg.json dist/vorta-0.6.22.dmg + sleep 2; appdmg appdmg.json dist/vorta-0.6.23.dmg Vorta.dmg: Vorta.app - # sleep 2; cd dist; zip -9rq vorta-0.6.22.zip Vorta.app - rm -rf dist/vorta-0.6.22.dmg - sleep 2; appdmg appdmg.json dist/vorta-0.6.22.dmg + rm -rf dist/vorta-0.6.23.dmg + sleep 2; appdmg appdmg.json dist/vorta-0.6.23.dmg -github-release: Vorta.dmg-Vagrant - hub release create --attach=dist/vorta-0.6.22.dmg v0.6.22 +github-release: Vorta.dmg + hub release create --attach=dist/vorta-0.6.23.dmg v0.6.23 git checkout gh-pages git commit -m 'rebuild pages' --allow-empty git push upstream gh-pages @@ -35,7 +36,7 @@ pypi-release: translations-to-qm python setup.py sdist - twine upload dist/vorta-0.6.22.tar.gz + twine upload dist/vorta-0.6.23.tar.gz bump-version: ## Add new version tag and push to upstream repo. bumpversion patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/setup.cfg new/vorta-0.6.23/setup.cfg --- old/vorta-0.6.22/setup.cfg 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/setup.cfg 2019-10-10 07:17:37.000000000 +0200 @@ -2,7 +2,7 @@ name = vorta author = Manuel Riel description = A GUI for BorgBackup -version = 0.6.22 +version = 0.6.23 url = https://github.com/borgbase/vorta keywords = backup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/src/vorta/_version.py new/vorta-0.6.23/src/vorta/_version.py --- old/vorta-0.6.22/src/vorta/_version.py 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/src/vorta/_version.py 2019-10-10 07:17:37.000000000 +0200 @@ -1 +1 @@ -__version__ = '0.6.22' +__version__ = '0.6.23' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml new/vorta-0.6.23/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml --- old/vorta-0.6.22/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml 2019-10-10 07:17:37.000000000 +0200 @@ -38,7 +38,7 @@ </screenshot> </screenshots> <releases> - <release version="v0.6.22" date="2019-08-03"> + <release version="v0.6.23" date="2019-10-10"> </release> </releases> <url type="bugtracker">https://github.com/borgbase/vorta/issues</url> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/src/vorta/borg/mount.py new/vorta-0.6.23/src/vorta/borg/mount.py --- old/vorta-0.6.22/src/vorta/borg/mount.py 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/src/vorta/borg/mount.py 2019-10-10 07:17:37.000000000 +0200 @@ -1,3 +1,4 @@ +import os from .borg_thread import BorgThread @@ -14,8 +15,7 @@ else: ret['ok'] = False # Set back to false, so we can do our own checks here. - cmd = ['borg', 'mount', '--log-json'] - cmd.append(f'{profile.repo.url}') + cmd = ['borg', '--log-json', 'mount', '-o', f"umask=0277,uid={os.getuid()}", f"{profile.repo.url}"] ret['ok'] = True ret['cmd'] = cmd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/src/vorta/views/archive_tab.py new/vorta-0.6.23/src/vorta/views/archive_tab.py --- old/vorta-0.6.22/src/vorta/views/archive_tab.py 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/src/vorta/views/archive_tab.py 2019-10-10 07:17:37.000000000 +0200 @@ -59,14 +59,7 @@ self.archiveTable.setAlternatingRowColors(True) self.archiveTable.cellDoubleClicked.connect(self.cell_double_clicked) self.archiveTable.itemSelectionChanged.connect(self.update_mount_button_text) - - # Populate pruning options from database - profile = self.profile() - for i in self.prune_intervals: - getattr(self, f'prune_{i}').setValue(getattr(profile, f'prune_{i}')) - getattr(self, f'prune_{i}').valueChanged.connect(self.save_prune_setting) - self.prune_keep_within.setText(profile.prune_keep_within) - self.prune_keep_within.editingFinished.connect(self.save_prune_setting) + self.archiveTable.setSortingEnabled(True) self.mountButton.clicked.connect(self.mount_action) self.listButton.clicked.connect(self.list_action) @@ -135,6 +128,14 @@ self.archiveNameTemplate.setText(profile.new_archive_name) self.prunePrefixTemplate.setText(profile.prune_prefix) + # Populate pruning options from database + profile = self.profile() + for i in self.prune_intervals: + getattr(self, f'prune_{i}').setValue(getattr(profile, f'prune_{i}')) + getattr(self, f'prune_{i}').valueChanged.connect(self.save_prune_setting) + self.prune_keep_within.setText(profile.prune_keep_within) + self.prune_keep_within.editingFinished.connect(self.save_prune_setting) + def save_archive_template(self, tpl, key): profile = self.profile() try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/src/vorta/views/diff_result.py new/vorta-0.6.23/src/vorta/views/diff_result.py --- old/vorta-0.6.22/src/vorta/views/diff_result.py 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/src/vorta/views/diff_result.py 2019-10-10 07:17:37.000000000 +0200 @@ -30,21 +30,30 @@ def parse_line(line): if line: - line_splitted = line.split() + line_split = line.split() else: return 0, "", "", "" - if line_splitted[0] == 'added' or line_splitted[0] == 'removed': - change_type = line_splitted[0] - size = line_splitted[1] - unit = line_splitted[2] + if line_split[0] == 'added' or line_split[0] == 'removed': + change_type = line_split[0] + size = line_split[1] + unit = line_split[2] else: change_type = "modified" - # Remove '+' or '-' sign at the front - size = line_splitted[0][1:] - unit = line_splitted[1] + size = line_split[0] + unit = line_split[1] + # If present remove '+' or '-' sign at the front + if size[0] in ('+', '-'): + size = size[1:] - if line_splitted[1] != 'directory': + if line_split[0].startswith("["): + size = 0 + change_type = line[:line.find(line_split[3])] + full_path = line[line.find(line_split[3]):] + dir, name = os.path.split(full_path) + # add to nested dict of folders to find nested dirs. + d = get_dict_from_list(nested_file_list, full_path.split('/')) + elif line_split[1] not in ['directory', 'link']: if unit == 'B': size = int(size) elif unit == 'kB': @@ -57,9 +66,9 @@ size = int(float(size) * 10**12) if change_type == 'added' or change_type == 'removed': - full_path = line[line.find(line_splitted[3]):] + full_path = line[line.find(line_split[3]):] elif change_type == "modified": - full_path = line[line.find(line_splitted[4]):] + full_path = line[line.find(line_split[4]):] dir, name = os.path.split(full_path) # add to nested dict of folders to find nested dirs. @@ -68,7 +77,7 @@ d[name] = {} else: size = 0 - full_path = line[line.find(line_splitted[2]):] + full_path = line[line.find(line_split[2]):] dir, name = os.path.split(full_path) # add to nested dict of folders to find nested dirs. @@ -213,7 +222,7 @@ return QVariant(QColor(Qt.red)) elif item.itemData[1] == 'added': return QVariant(QColor(Qt.green)) - elif item.itemData[1] == 'modified': + elif item.itemData[1] == 'modified' or item.itemData[1].startswith('['): return QVariant(QColor(Qt.darkYellow)) if role == Qt.DisplayRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vorta-0.6.22/vorta.spec new/vorta-0.6.23/vorta.spec --- old/vorta-0.6.22/vorta.spec 2019-08-03 08:13:01.000000000 +0200 +++ new/vorta-0.6.23/vorta.spec 2019-10-10 07:17:37.000000000 +0200 @@ -55,8 +55,8 @@ info_plist={ 'NSHighResolutionCapable': 'True', 'LSUIElement': '1', - 'CFBundleShortVersionString': '0.6.22', - 'CFBundleVersion': '0.6.22', + 'CFBundleShortVersionString': '0.6.23', + 'CFBundleVersion': '0.6.23', 'NSAppleEventsUsageDescription': 'Please allow', 'SUFeedURL': 'https://borgbase.github.io/vorta/appcast.xml', 'LSEnvironment': {
