diff options
author | Guillem Jover <guillem@debian.org> | 2019-01-22 03:45:29 +0100 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2019-01-22 04:02:19 +0100 |
commit | 8b1d07b22c2d64f0db5a8de205ff5bbe778a51ba (patch) | |
tree | e882ea31fb4932f281563c8ed5c86f2a8ea64184 /src | |
parent | 61bbb77adb5f2c8d6a6d9bff18efa63a4cd2047f (diff) | |
download | dpkg-8b1d07b22c2d64f0db5a8de205ff5bbe778a51ba.tar.gz |
dpkg: Move dependtry description from deferred_configure() to its declaration
This moves the description closer to the type defining its values, which
makes more sense than in the configure function.
Diffstat (limited to 'src')
-rw-r--r-- | src/configure.c | 24 | ||||
-rw-r--r-- | src/main.h | 27 |
2 files changed, 27 insertions, 24 deletions
diff --git a/src/configure.c b/src/configure.c index 99fc81634..e7237106d 100644 --- a/src/configure.c +++ b/src/configure.c @@ -536,30 +536,6 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff) /** * Process the deferred configure package. * - * The algorithm for deciding what to configure first is as follows: - * Loop through all packages doing a ‘try 1’ until we've been round - * and nothing has been done, then do ‘try 2’ and ‘try 3’ likewise. - * The incrementing of ‘dependtry’ is done by process_queue(). - * - * Try 1: - * Are all dependencies of this package done? If so, do it. - * Are any of the dependencies missing or the wrong version? - * If so, abort (unless --force-depends, in which case defer). - * Will we need to configure a package we weren't given as an - * argument? If so, abort ─ except if --force-configure-any, - * in which case we add the package to the argument list. - * If none of the above, defer the package. - * - * Try 2: - * Find a cycle and break it (see above). - * Do as for try 1. - * - * Try 3 (only if --force-depends-version): - * Same as for try 2, but don't mind version number in dependencies. - * - * Try 4 (only if --force-depends): - * Do anyway. - * * @param pkg The package to act on. */ void diff --git a/src/main.h b/src/main.h index b0d08f9da..e43e6d28d 100644 --- a/src/main.h +++ b/src/main.h @@ -217,6 +217,33 @@ enum dep_check breakses_ok(struct pkginfo *pkg, struct varbuf *aemsgs); void deferred_remove(struct pkginfo *pkg); void deferred_configure(struct pkginfo *pkg); +/* + * During the packages queue processing, the algorithm for deciding what to + * configure first is as follows: + * + * Loop through all packages doing a ‘try 1’ until we've been round and + * nothing has been done, then do ‘try 2’, and subsequent ones likewise. + * The incrementing of ‘dependtry’ is done by process_queue(). + * + * Try 1: + * Are all dependencies of this package done? If so, do it. + * Are any of the dependencies missing or the wrong version? + * If so, abort (unless --force-depends, in which case defer). + * Will we need to configure a package we weren't given as an + * argument? If so, abort ─ except if --force-configure-any, + * in which case we add the package to the argument list. + * If none of the above, defer the package. + * + * Try 2: + * Find a cycle and break it (see above). + * Do as for try 1. + * + * Try 3 (only if --force-depends-version): + * Same as for try 2, but don't mind version number in dependencies. + * + * Try 4 (only if --force-depends): + * Do anyway. + */ enum dependtry { DEPEND_TRY_NORMAL = 1, DEPEND_TRY_CYCLES = 2, |