From 90d4c4be3bc15b2f594a0046c07b6f8654659ad5 Mon Sep 17 00:00:00 2001 From: kitsunyan Date: Fri, 20 Dec 2019 07:35:07 +0300 Subject: Add Nim 1.0 support --- src/feature/localquery.nim | 2 +- src/feature/syncclean.nim | 5 ++--- src/feature/syncinfo.nim | 2 +- src/feature/syncinstall.nim | 2 +- src/feature/syncsearch.nim | 2 +- src/feature/syncsource.nim | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/feature') diff --git a/src/feature/localquery.nim b/src/feature/localquery.nim index 4a21fa9..1d58bdc 100644 --- a/src/feature/localquery.nim +++ b/src/feature/localquery.nim @@ -1,5 +1,5 @@ import - algorithm, future, options, sequtils, sets, strutils, tables, + algorithm, options, sequtils, sets, strutils, sugar, tables, "../args", "../common", "../config", "../format", "../package", "../pacman", "../utils", "../wrapper/alpm" diff --git a/src/feature/syncclean.nim b/src/feature/syncclean.nim index 2e57908..6b1f853 100644 --- a/src/feature/syncclean.nim +++ b/src/feature/syncclean.nim @@ -1,7 +1,6 @@ import - future, options, os, posix, sequtils, strutils, tables, - "../args", "../aur", "../common", "../config", "../format", "../lists", - "../package", "../pacman", "../utils", + options, os, posix, strutils, + "../args", "../common", "../config", "../format", "../pacman", "../utils", "../wrapper/alpm" proc handleSyncClean*(args: seq[Argument], config: Config): int = diff --git a/src/feature/syncinfo.nim b/src/feature/syncinfo.nim index 9bee287..4f758fe 100644 --- a/src/feature/syncinfo.nim +++ b/src/feature/syncinfo.nim @@ -1,5 +1,5 @@ import - future, options, posix, sequtils, strutils, tables, times, + options, posix, sequtils, strutils, sugar, tables, "../args", "../aur", "../common", "../config", "../format", "../package", "../pacman", "../utils", "../wrapper/alpm" diff --git a/src/feature/syncinstall.nim b/src/feature/syncinstall.nim index 1f079ee..fef4f82 100644 --- a/src/feature/syncinstall.nim +++ b/src/feature/syncinstall.nim @@ -1,5 +1,5 @@ import - algorithm, future, options, os, posix, sequtils, sets, strutils, tables, + algorithm, options, os, posix, sequtils, sets, strutils, sugar, tables, "../args", "../aur", "../config", "../common", "../format", "../lists", "../package", "../pacman", "../utils", "../wrapper/alpm" diff --git a/src/feature/syncsearch.nim b/src/feature/syncsearch.nim index 3d4cd0f..b20109f 100644 --- a/src/feature/syncsearch.nim +++ b/src/feature/syncsearch.nim @@ -1,5 +1,5 @@ import - algorithm, future, options, sequtils, strutils, + algorithm, options, sequtils, strutils, sugar, "../args", "../aur", "../config", "../common", "../format", "../package", "../pacman", "../utils", "../wrapper/alpm" diff --git a/src/feature/syncsource.nim b/src/feature/syncsource.nim index b080aff..c050e6a 100644 --- a/src/feature/syncsource.nim +++ b/src/feature/syncsource.nim @@ -1,5 +1,5 @@ import - future, options, os, posix, sequtils, strutils, tables, + options, os, posix, sequtils, strutils, sugar, tables, "../args", "../aur", "../common", "../config", "../format", "../lists", "../package", "../pacman", "../utils", "../wrapper/alpm" @@ -145,7 +145,7 @@ proc cloneAndCopy(config: Config, quiet: bool, fullTargets: seq[FullPackageTarge removeDirQuiet(result.path) discard rmdir(config.tmpRootCurrent) - if rerrors != nil and cerrors != nil: + if rerrors.len > 0 or cerrors != nil: 1 else: 0 -- cgit v1.2.3-70-g09d2