diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /guix/scripts/deploy.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
Diffstat (limited to 'guix/scripts/deploy.scm')
| -rw-r--r-- | guix/scripts/deploy.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 2c76645173..40a9374171 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -256,7 +256,7 @@ otherwise." (leave (G_ "missing deployment file argument~%"))) (when (and (pair? command) (not execute-command?)) - (leave (G_ "'--' was used by '-x' was not specified~%"))) + (leave (G_ "'--' was used, but '-x' was not specified~%"))) (with-status-verbosity (assoc-ref opts 'verbosity) (with-store store |