Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-09-25 08:29:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Sep 25 08:29:19 2019 rev:221 rq:732800 version:20190923.83f1d51c
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-09-23 12:39:27.725589778 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.7948/openSUSE-release-tools.changes
2019-09-25 08:29:21.566376833 +0200
@@ -1,0 +2,7 @@
+Mon Sep 23 23:48:00 UTC 2019 - [email protected]
+
+- Update to version 20190923.83f1d51c:
+ * osclib/cache: utilize rmtree_nfs_safe().
+ * osclib/util: provide rmtree_nfs_safe().
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190920.155606e3.obscpio
New:
----
openSUSE-release-tools-20190923.83f1d51c.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.gswuVZ/_old 2019-09-25 08:29:22.806376665 +0200
+++ /var/tmp/diff_new_pack.gswuVZ/_new 2019-09-25 08:29:22.806376665 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190920.155606e3
+Version: 20190923.83f1d51c
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.gswuVZ/_old 2019-09-25 08:29:22.834376661 +0200
+++ /var/tmp/diff_new_pack.gswuVZ/_new 2019-09-25 08:29:22.834376661 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">155606e3d848327ec20ff6713282a1dc54ae7484</param>
+ <param
name="changesrevision">83f1d51c3b67e42f7d5d253bbea42273525838e2</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20190920.155606e3.obscpio ->
openSUSE-release-tools-20190923.83f1d51c.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190920.155606e3/osclib/cache.py
new/openSUSE-release-tools-20190923.83f1d51c/osclib/cache.py
--- old/openSUSE-release-tools-20190920.155606e3/osclib/cache.py
2019-09-20 13:02:48.000000000 +0200
+++ new/openSUSE-release-tools-20190923.83f1d51c/osclib/cache.py
2019-09-24 01:45:31.000000000 +0200
@@ -5,7 +5,6 @@
import os
import osc.core
import re
-import shutil
import sys
try:
@@ -25,6 +24,7 @@
from osc import conf
from osc.core import urlopen
from osclib.cache_manager import CacheManager
+from osclib.util import rmtree_nfs_safe
from time import time
try:
@@ -246,12 +246,12 @@
if os.path.exists(path):
if conf.config['debug']: print('CACHE_DELETE_PROJECT', apiurl,
project, file=sys.stderr)
- shutil.rmtree(path)
+ rmtree_nfs_safe(path)
@staticmethod
def delete_all():
if os.path.exists(Cache.CACHE_DIR):
- shutil.rmtree(Cache.CACHE_DIR)
+ rmtree_nfs_safe(Cache.CACHE_DIR)
@staticmethod
def match(url):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190920.155606e3/osclib/util.py
new/openSUSE-release-tools-20190923.83f1d51c/osclib/util.py
--- old/openSUSE-release-tools-20190920.155606e3/osclib/util.py 2019-09-20
13:02:48.000000000 +0200
+++ new/openSUSE-release-tools-20190923.83f1d51c/osclib/util.py 2019-09-24
01:45:31.000000000 +0200
@@ -177,3 +177,17 @@
data = data.encode('utf-8')
return hashlib.sha1(data).hexdigest()[:7]
+
+def rmtree_nfs_safe(path, attempts=5):
+ import shutil
+ try:
+ shutil.rmtree(path)
+ except OSError as e:
+ # Directory not empty due to slow filesystem (see #1326 old occurance).
+ if attempts <= 0 or e.errno != 39:
+ raise e
+
+ from time import sleep
+ sleep(0.25)
+
+ rmtree_nfs_safe(path, attempts - 1)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.gswuVZ/_old 2019-09-25 08:29:24.486376438 +0200
+++ /var/tmp/diff_new_pack.gswuVZ/_new 2019-09-25 08:29:24.494376437 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190920.155606e3
-mtime: 1568977368
-commit: 155606e3d848327ec20ff6713282a1dc54ae7484
+version: 20190923.83f1d51c
+mtime: 1569282331
+commit: 83f1d51c3b67e42f7d5d253bbea42273525838e2
