Merge pull request lago-project#243 from lago-project/more_reposync_fixes

lago-bot · lago-bot · commit 019b3360925f · 2016-05-11T23:08:29.000+02:00
Yet another small fix to better detect reposync issues
diff --git a/ovirtlago/__init__.py b/ovirtlago/__init__.py
@@ -66,7 +66,7 @@ def _fix_reposync_issues(reposync_out, repo_path):
         'sometimes reposync fails to update some packages that have older '
         'versions already downloaded, will remove those if any and retry'
     )
-    package_regex = re.compile(r'(?P<package_name>[^:\r]+): \[Errno 256\]')
+    package_regex = re.compile(r'(?P<package_name>[^:\r\s]+): \[Errno 256\]')
     for match in package_regex.findall(reposync_out):
         find_command = ['find', repo_path, '-name', match + '*', ]
         ret, out, _ = utils.run_command(find_command)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ def _fix_reposync_issues(reposync_out, repo_path):`
`66`	`66`	`'sometimes reposync fails to update some packages that have older '`
`67`	`67`	`'versions already downloaded, will remove those if any and retry'`
`68`	`68`	`)`
`69`		`- package_regex = re.compile(r'(?P<package_name>[^:\r]+): \[Errno 256\]')`
	`69`	`+ package_regex = re.compile(r'(?P<package_name>[^:\r\s]+): \[Errno 256\]')`
`70`	`70`	`for match in package_regex.findall(reposync_out):`
`71`	`71`	`find_command = ['find', repo_path, '-name', match + '*', ]`
`72`	`72`	`ret, out, _ = utils.run_command(find_command)`