@@ -12,7 +12,7 @@ use inquire::{
12
12
ui:: { Color , RenderConfig , StyleSheet , Styled } ,
13
13
} ;
14
14
use oma_pm:: {
15
- apt:: { AptConfig , FilterMode , OmaApt , OmaAptArgs , Upgrade } ,
15
+ apt:: { AptConfig , FilterMode , OmaApt , OmaAptArgs } ,
16
16
matches:: { GetArchMethod , PackagesMatcher } ,
17
17
} ;
18
18
use oma_utils:: dpkg:: dpkg_arch;
@@ -218,6 +218,7 @@ impl CliExecuter for Topics {
218
218
let matcher = PackagesMatcher :: builder ( )
219
219
. cache ( & apt. cache )
220
220
. native_arch ( GetArchMethod :: SpecifySysroot ( & sysroot) )
221
+ . select_dbg ( false )
221
222
. build ( ) ;
222
223
223
224
for pkg in downgrade_pkgs {
@@ -232,14 +233,27 @@ impl CliExecuter for Topics {
232
233
233
234
if pkg. is_installed ( ) {
234
235
let pkginfo = matcher. find_candidate_by_pkgname ( pkg. name ( ) ) ?;
235
-
236
236
pkgs. push ( pkginfo) ;
237
237
}
238
238
}
239
239
}
240
240
241
+ for pkg in enabled_pkgs {
242
+ let mut f = apt
243
+ . filter_pkgs ( & [ FilterMode :: Default ] ) ?
244
+ . filter ( |x| x. name ( ) == pkg) ;
245
+
246
+ if let Some ( pkg) = f. next ( ) {
247
+ if !pkg. is_installed ( ) {
248
+ continue ;
249
+ }
250
+
251
+ let pkginfo = matcher. find_candidate_by_pkgname ( pkg. name ( ) ) ?;
252
+ pkgs. push ( pkginfo) ;
253
+ }
254
+ }
255
+
241
256
apt. install ( & pkgs, false ) ?;
242
- apt. upgrade ( Upgrade :: FullUpgrade ) ?;
243
257
244
258
let code = CommitChanges :: builder ( )
245
259
. apt ( apt)
0 commit comments