File tree 1 file changed +12
-8
lines changed
1 file changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -150,15 +150,19 @@ impl DarwinRebuildArgs {
150
150
. message ( "Activating configuration" )
151
151
. dry ( self . common . dry ) ;
152
152
153
- // Check whether to activate-user is deprecated
154
- // If it is, only activate with root
155
- if std:: fs:: read_to_string ( & activate_user)
156
- . context ( "Failed to read activate-user file" ) ?
157
- . contains ( "# nix-darwin: deprecated" )
158
- {
159
- activation. run ( ) ?;
153
+ if activate_user. exists ( ) {
154
+ // Check whether activate-user is deprecated
155
+ // If it is, only activate with root
156
+ if std:: fs:: read_to_string ( & activate_user)
157
+ . context ( "Failed to read activate-user file" ) ?
158
+ . contains ( "# nix-darwin: deprecated" )
159
+ {
160
+ activation. run ( ) ?;
161
+ } else {
162
+ user_activation. run ( ) ?;
163
+ activation. run ( ) ?;
164
+ }
160
165
} else {
161
- user_activation. run ( ) ?;
162
166
activation. run ( ) ?;
163
167
}
164
168
}
You can’t perform that action at this time.
0 commit comments