diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/installer/steps.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/installer/steps.scm')
| -rw-r--r-- | gnu/installer/steps.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 0b6d8e4649..16d74c207f 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -88,7 +88,7 @@ (rewind-strategy 'previous) (menu-proc (const #f))) "Run the COMPUTE procedure of all <installer-step> records in STEPS -sequencially. If the &installer-step-abort condition is raised, fallback to a +sequentially. If the &installer-step-abort condition is raised, fallback to a previous install-step, accordingly to the specified REWIND-STRATEGY. REWIND-STRATEGY possible values are 'previous, 'menu and 'start. If 'previous |