Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nautilus-dropbox for
openSUSE:Factory checked in at 2026-10-01 16:43:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nautilus-dropbox (Old)
and /work/SRC/openSUSE:Factory/.nautilus-dropbox.new.1253 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-dropbox"
Thu Oct 1 16:43:05 2026 rev:26 rq:1381612 version:2026.09.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/nautilus-dropbox/nautilus-dropbox.changes
2026-08-21 22:17:41.600737714 +0200
+++
/work/SRC/openSUSE:Factory/.nautilus-dropbox.new.1253/nautilus-dropbox.changes
2026-10-01 16:44:32.273735314 +0200
@@ -1,0 +2,9 @@
+Wed Sep 30 06:29:45 UTC 2026 - Dominique Leuenberger <[email protected]>
+
+- Update to version 2026.09.28:
+ + Added Fedora 46 to build matrix.
+- Changes from version 2026.08.26:
+ + Makes `dropbox-cli start` more robust by adding internal
+ retries and better messaging.
+
+-------------------------------------------------------------------
Old:
----
nautilus-dropbox-2026.05.06.tar.xz
New:
----
nautilus-dropbox-2026.09.28.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus-dropbox.spec ++++++
--- /var/tmp/diff_new_pack.jFTOEe/_old 2026-10-01 16:44:32.895761389 +0200
+++ /var/tmp/diff_new_pack.jFTOEe/_new 2026-10-01 16:44:32.896761431 +0200
@@ -19,7 +19,7 @@
%global nautilus_extdir %( pkg-config libnautilus-extension-4 --variable
extensiondir )
Name: nautilus-dropbox
-Version: 2026.05.06
+Version: 2026.09.28
Release: 0
Summary: Dropbox client integrated into Nautilus
License: GPL-3.0-or-later AND CC-BY-ND-3.0
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.jFTOEe/_old 2026-10-01 16:44:32.929762814 +0200
+++ /var/tmp/diff_new_pack.jFTOEe/_new 2026-10-01 16:44:32.933762982 +0200
@@ -1,6 +1,7 @@
-mtime: 1787225332
-commit: 8554631ff2e476eb092ffc934556317e91af737749b4824d96a253a124d73b9c
+mtime: 1790749833
+commit: 60228f5d7c4a1e57cbbb9edd149f46a6f50a412a1369e21ad42f0e04307f502e
url: https://src.opensuse.org/GNOME/nautilus-dropbox
-revision: 8554631ff2e476eb092ffc934556317e91af737749b4824d96a253a124d73b9c
+revision: 60228f5d7c4a1e57cbbb9edd149f46a6f50a412a1369e21ad42f0e04307f502e
+trackingbranch: factory
projectscmsync: https://src.opensuse.org/GNOME/_ObsPrj
++++++ _service ++++++
--- /var/tmp/diff_new_pack.jFTOEe/_old 2026-10-01 16:44:32.952763779 +0200
+++ /var/tmp/diff_new_pack.jFTOEe/_new 2026-10-01 16:44:32.956763946 +0200
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/dropbox/nautilus-dropbox.git</param>
- <param name="revision">v2026.05.06</param>
+ <param name="revision">v2026.09.28</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2026-09-30 08:30:33.000000000 +0200
@@ -0,0 +1,5 @@
+*.obscpio
+*.osc
+_build.*
+.pbuild
+osc-collab.*
++++++ nautilus-dropbox-2026.05.06.tar.xz -> nautilus-dropbox-2026.09.28.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/nautilus-dropbox-2026.05.06/.github/workflows/canary.yml
new/nautilus-dropbox-2026.09.28/.github/workflows/canary.yml
--- old/nautilus-dropbox-2026.05.06/.github/workflows/canary.yml
2026-05-06 22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/.github/workflows/canary.yml
2026-09-29 22:15:33.000000000 +0200
@@ -35,6 +35,11 @@
steps:
- name: Clone repo
uses: actions/checkout@v4
+ - name: Disable frequently unavailable repos
+ run: |
+ (grep -qi "rawhide" /etc/os-release) \
+ && dnf config-manager disable fedora-cisco-openh264 \
+ || echo "No unavailable repos to disable."
- name: Install deps
run: ./${{ matrix.config.deps-script }}
- name: Test build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/ChangeLog
new/nautilus-dropbox-2026.09.28/ChangeLog
--- old/nautilus-dropbox-2026.05.06/ChangeLog 2026-05-06 22:19:21.000000000
+0200
+++ new/nautilus-dropbox-2026.09.28/ChangeLog 2026-09-29 22:15:33.000000000
+0200
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
Date based versioning is now used in this project. This is so that it doesn't
get confused with the Dropbox desktop client.
+## Version 2026.09.28
+
+- Added Fedora 46 to build matrix.
+
+## Version 2026.08.26
+
+- Makes `dropbox-cli start` more robust by adding internal retries and better
messaging.
+
## Version 2026.05.06
- Put build-only packages behind a flag on Debian/Ubuntu.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/build_packages.sh
new/nautilus-dropbox-2026.09.28/build_packages.sh
--- old/nautilus-dropbox-2026.05.06/build_packages.sh 2026-05-06
22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/build_packages.sh 2026-09-29
22:15:33.000000000 +0200
@@ -6,7 +6,7 @@
# Build deb packages.
for DISTRO in ubuntu debian debian_i386; do
- docker build -t nautilus-dropbox/$DISTRO -f Dockerfile.$DISTRO .
+ docker build --pull -t nautilus-dropbox/$DISTRO -f Dockerfile.$DISTRO .
docker run -u "$(id -u):$(id -g)" -v `pwd`:/src nautilus-dropbox/$DISTRO
./generate-deb.sh
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/configure.ac
new/nautilus-dropbox-2026.09.28/configure.ac
--- old/nautilus-dropbox-2026.05.06/configure.ac 2026-05-06
22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/configure.ac 2026-09-29
22:15:33.000000000 +0200
@@ -1,6 +1,6 @@
# Initialization
-AC_INIT([nautilus-dropbox], 2026.05.06)
+AC_INIT([nautilus-dropbox], 2026.09.28)
AM_INIT_AUTOMAKE([foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/distro-info.sh
new/nautilus-dropbox-2026.09.28/distro-info.sh
--- old/nautilus-dropbox-2026.05.06/distro-info.sh 2026-05-06
22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/distro-info.sh 2026-09-29
22:15:33.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
# This file also gets execfile'd by python so don't do anything here besides
set variables.
-UBUNTU_CODENAMES="kinetic lunar mantic noble oracular plucky questing resolute"
+UBUNTU_CODENAMES="kinetic lunar mantic noble oracular plucky questing resolute
stonking"
DEBIAN_CODENAMES="bookworm trixie forky sid"
-FEDORA_CODENAMES="37 38 39 40 41 42 43 44 45"
+FEDORA_CODENAMES="37 38 39 40 41 42 43 44 45 46"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/dropbox.in
new/nautilus-dropbox-2026.09.28/dropbox.in
--- old/nautilus-dropbox-2026.05.06/dropbox.in 2026-05-06 22:19:21.000000000
+0200
+++ new/nautilus-dropbox-2026.09.28/dropbox.in 2026-09-29 22:15:33.000000000
+0200
@@ -39,6 +39,8 @@
import urllib.request
import base64
+from enum import Enum
+
try:
import gpg
gpgme = None
@@ -54,7 +56,6 @@
from io import BytesIO
from operator import methodcaller
from os.path import relpath
-from posixpath import curdir, sep, pardir, join, abspath, commonprefix
INFO = "Dropbox is the easiest way to share and store your files online. Want
to learn more? Head to"
LINK = "https://www.dropbox.com/";
@@ -75,6 +76,9 @@
DROPBOXD_PATH = os.path.join(DROPBOX_DIST_PATH, "dropboxd")
DESKTOP_FILE = "@DESKTOP_FILE_DIR@/dropbox.desktop"
+STARTUP_TIMEOUT_SECONDS = 60
+STARTUP_POLL_INTERVAL_SECONDS = 0.5
+
enc = locale.getpreferredencoding()
# Available from https://linux.dropbox.com/fedora/rpm-public-key.asc
@@ -787,14 +791,11 @@
subprocess.Popen([DROPBOXD_PATH], preexec_fn=os.setsid,
cwd=os.path.expanduser("~"),
stderr=sys.stderr, stdout=f, close_fds=True,
env=new_env)
- # in seconds
- interval = 0.5
- wait_for = 60
- for _ in range(int(wait_for / interval)):
+ for _ in range(int(STARTUP_TIMEOUT_SECONDS /
STARTUP_POLL_INTERVAL_SECONDS)):
if is_dropbox_running():
return True
# back off from connect for a while
- time.sleep(interval)
+ time.sleep(STARTUP_POLL_INTERVAL_SECONDS)
return False
else:
@@ -1272,25 +1273,74 @@
except DropboxCommand.CouldntConnectError:
console_print("Dropbox isn't running!")
-#returns true if link is necessary
-def grab_link_url_if_necessary():
- try:
- with closing(DropboxCommand()) as dc:
- try:
- link_url = dc.needs_link().get("link_url", None)
+class GrabLinkUrlResult(Enum):
+ LINK_URL_DISPLAYED = 1
+ NO_LINK_URL = 2
+ COMMAND_ERROR = 3
+ COMMAND_SOCKET_UNAVAILABLE = 4
+
+
+def grab_link_url_if_necessary(retry_until=None, report_transport_errors=True):
+ """Display a link URL when needed and report command-server readiness.
+
+ If retry_until is set to a monotonic deadline, transport failures are
retried
+ until that deadline. A command-level error proves that the command server
is
+ available, so it is returned separately and is not retried. Transport
errors
+ are reported only after retries are exhausted.
+ """
+ attempted = False
+ transport_error_message = None
+ while retry_until is None or not attempted or time.monotonic() <
retry_until:
+ attempted = True
+ command_timeout = 5
+ if retry_until is not None:
+ remaining = retry_until - time.monotonic()
+ command_timeout = max(1, min(command_timeout, remaining))
+
+ try:
+ with closing(DropboxCommand(timeout=command_timeout)) as dc:
+ try:
+ link_url = dc.needs_link().get("link_url", None)
+ except DropboxCommand.CommandError:
+ return GrabLinkUrlResult.COMMAND_ERROR
+
if link_url is not None:
console_print("To link this computer to a Dropbox account,
visit the following url:\n%s" % link_url[0])
- return True
- else:
- return False
- except DropboxCommand.CommandError:
- pass
- except DropboxCommand.BadConnectionError:
- console_print("Dropbox isn't responding!")
- except DropboxCommand.EOFError:
- console_print("Dropbox daemon stopped.")
- except DropboxCommand.CouldntConnectError:
- console_print("Dropbox isn't running!")
+ return GrabLinkUrlResult.LINK_URL_DISPLAYED
+ return GrabLinkUrlResult.NO_LINK_URL
+ except DropboxCommand.CouldntConnectError:
+ transport_error_message = "Dropbox isn't running!"
+ except DropboxCommand.BadConnectionError:
+ transport_error_message = "Dropbox isn't responding!"
+ except DropboxCommand.EOFError:
+ transport_error_message = "Dropbox daemon stopped."
+
+ if retry_until is None:
+ break
+
+ remaining = retry_until - time.monotonic()
+ if remaining > 0:
+ time.sleep(min(STARTUP_POLL_INTERVAL_SECONDS, remaining))
+
+ if report_transport_errors and transport_error_message is not None:
+ console_print(transport_error_message)
+ return GrabLinkUrlResult.COMMAND_SOCKET_UNAVAILABLE
+
+
+def start_dropbox_and_report_result():
+ startup_deadline = time.monotonic() + STARTUP_TIMEOUT_SECONDS
+ if not start_dropbox():
+ return False
+
+ link_result = grab_link_url_if_necessary(
+ retry_until=startup_deadline, report_transport_errors=False
+ )
+ if link_result == GrabLinkUrlResult.COMMAND_SOCKET_UNAVAILABLE:
+ console_print()
+ console_print("Dropbox is running, but its command socket is
unavailable!")
+ elif link_result != GrabLinkUrlResult.LINK_URL_DISPLAYED:
+ console_print("Done!")
+ return True
@command
@requires_dropbox_running
@@ -1442,13 +1492,16 @@
# first check if dropbox is already running
if is_dropbox_running():
- if not grab_link_url_if_necessary():
+ link_result = grab_link_url_if_necessary(report_transport_errors=False)
+ if link_result == GrabLinkUrlResult.COMMAND_SOCKET_UNAVAILABLE:
+ console_print("Dropbox is running, but its command socket is
unavailable!")
+ elif link_result != GrabLinkUrlResult.LINK_URL_DISPLAYED:
console_print("Dropbox is already running!")
return
console_print("Starting Dropbox...", linebreak=False)
console_flush()
- if not start_dropbox():
+ if not start_dropbox_and_report_result():
if not should_install:
console_print()
console_print("The Dropbox daemon is not installed!")
@@ -1465,12 +1518,7 @@
start_dropbox()
console_print("Done!")
else:
- if start_dropbox():
- if not grab_link_url_if_necessary():
- console_print("Done!")
- else:
- if not grab_link_url_if_necessary():
- console_print("Done!")
+ start_dropbox_and_report_result()
def can_reroll_autostart():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/generate-deb.sh
new/nautilus-dropbox-2026.09.28/generate-deb.sh
--- old/nautilus-dropbox-2026.05.06/generate-deb.sh 2026-05-06
22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/generate-deb.sh 2026-09-29
22:15:33.000000000 +0200
@@ -14,6 +14,8 @@
cp -R $SRCDIR/* $TMPDIR/
cd $TMPDIR
+autoreconf -f -i
+
# get version
CURVER=$(mawk '/^AC_INIT/{sub("AC_INIT\(\[nautilus-dropbox\], ", "");
sub("\)", ""); print $0}' configure.ac)
@@ -458,4 +460,4 @@
DISTRO=$(lsb_release -s -i | tr '[:upper:]' '[:lower:]')
OUTDIR=$SRCDIR/build/$DISTRO/pool/main
mkdir -p $OUTDIR
-cp $TMPDIR/*.deb $TMPDIR/*.changes $TMPDIR/*.build $TMPDIR/*.buildinfo $OUTDIR/
\ No newline at end of file
+cp $TMPDIR/*.deb $TMPDIR/*.changes $TMPDIR/*.build $TMPDIR/*.buildinfo $OUTDIR/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nautilus-dropbox-2026.05.06/install-apt-deps.sh
new/nautilus-dropbox-2026.09.28/install-apt-deps.sh
--- old/nautilus-dropbox-2026.05.06/install-apt-deps.sh 2026-05-06
22:19:21.000000000 +0200
+++ new/nautilus-dropbox-2026.09.28/install-apt-deps.sh 2026-09-29
22:15:33.000000000 +0200
@@ -15,9 +15,9 @@
case "${DBX_BUILD_ENV:=local}" in
packaging)
- apt-get install -fy cdbs
+ apt-get install -fy cdbs autotools-dev automake
;;
*)
;;
-esac
\ No newline at end of file
+esac
++++++ nautilus-dropbox.obsinfo ++++++
--- /var/tmp/diff_new_pack.jFTOEe/_old 2026-10-01 16:44:33.251776313 +0200
+++ /var/tmp/diff_new_pack.jFTOEe/_new 2026-10-01 16:44:33.270777110 +0200
@@ -1,5 +1,5 @@
name: nautilus-dropbox
-version: 2026.05.06
-mtime: 1778098761
-commit: 288f5cd44711398b84e2a86fc782f053f5d548fa
+version: 2026.09.28
+mtime: 1790712933
+commit: 1330699601934a19a1aa26970adef6a9970c92f5
