instrumentation

Signed-off-by: Claudio Matsuoka <[email protected]>
canonical · Jan 17, 2025 · 62988c1 · 62988c1
1 parent 9ba562f
commit 62988c1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -59,7 +59,7 @@ craft-grammar==2.0.1
     # via
     #   craft-application
     #   snapcraft (setup.py)
-craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution
+craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation
     # via
     #   craft-application
     #   snapcraft (setup.py)

diff --git a/requirements.txt b/requirements.txt
@@ -41,7 +41,7 @@ craft-grammar==2.0.1
     # via
     #   craft-application
     #   snapcraft (setup.py)
-craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution
+craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation
     # via
     #   craft-application
     #   snapcraft (setup.py)

diff --git a/setup.py b/setup.py
@@ -102,7 +102,7 @@ def recursive_data_files(directory, install_directory):
     "craft-archives~=2.0",
     "craft-cli~=2.9",
     "craft-grammar>=2.0.1,<3.0.0",
-    "craft-parts @ git+https://github.com/canonical/craft-parts@CRAFT-3828-Capture-error-in-step-scriptlet-execution",
+    "craft-parts @ git+https://github.com/cmatsuoka/craft-parts@craft-3828-instrumentation",
     "craft-platforms~=0.4",
     "craft-providers>=2.0.4,<3.0.0",
     "craft-store>=3.0.2,<4.0.0",

diff --git a/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml b/tests/spread/core24-suites/scriptlets/scriptlet-failures/task.yaml
@@ -5,7 +5,7 @@ restore: |  # If this next line fails, delete it and replace it with the one fol
   rm -f ./*.snap
 
 execute: |
-  snapcraft_log="$(snapcraft build 2>&1 || true)"
+  snapcraft_log="$(snapcraft build || true)"
 
   echo "${snapcraft_log}" | NOMATCH "^should have failed set-version"
   echo "${snapcraft_log}" | NOMATCH "^should have failed build"