Procházet zdrojové kódy

dpkg: Move comment and assignment just before its related code block

The related code blocks got split by the introduction of code inbetween
in commit e5bf4b7412bb2a4e5ff33f128c3cb8dcd96fcfdb.
Guillem Jover před 14 roky
rodič
revize
f46879826a
1 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 4 4
      src/processarc.c

+ 4 - 4
src/processarc.c

@@ -531,10 +531,6 @@ void process_archive(const char *filename) {
       return;
   }
 
-  /* Check if anything is installed that we conflict with, or not installed
-   * that we need. */
-  pkg->clientdata->istobe= itb_installnew;
-
   /* Deconfigure other instances from a pkgset if they are not in sync. */
   for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
     if (otherpkg == pkg)
@@ -546,6 +542,10 @@ void process_archive(const char *filename) {
       enqueue_deconfigure(otherpkg, NULL);
   }
 
+  /* Check if anything is installed that we conflict with, or not installed
+   * that we need. */
+  pkg->clientdata->istobe = itb_installnew;
+
   for (dsearch= pkg->available.depends; dsearch; dsearch= dsearch->next) {
     switch (dsearch->type) {
     case dep_conflicts: