From e883604d05777a141c4aec4b0f6c9db069c6a47d Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Fri, 6 Oct 2017 18:12:42 -0500 Subject: [PATCH] dist/ci/deploy: handle expanded links during target project loookup. --- dist/ci/deploy.obs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/ci/deploy.obs.sh b/dist/ci/deploy.obs.sh index 6c37ec0e..1306b3b0 100755 --- a/dist/ci/deploy.obs.sh +++ b/dist/ci/deploy.obs.sh @@ -19,8 +19,8 @@ osc addremove osc commit -m "$(grep -oP 'version: \K.*' *.obsinfo)" # Create submit request if none currently exists. -OBS_TARGET_PROJECT="$(osc info | grep -oP "Link info: project \K[^\s,]+")" -OBS_TARGET_PACKAGE="$(osc info | grep -oP "Link info: .*, package \K[^\s,]+")" +OBS_TARGET_PROJECT="$(osc info | grep -oP "Link info:.*?project \K[^\s,]+")" +OBS_TARGET_PACKAGE="$(osc info | grep -oP "Link info:.*?, package \K[^\s,]+")" echo "checking for existing requests to $OBS_TARGET_PROJECT/$OBS_TARGET_PACKAGE..." if osc request list "$OBS_TARGET_PROJECT" "$OBS_TARGET_PACKAGE" | grep 'No results for package' ; then osc service wait