소스 검색

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 14 년 전
부모
커밋
f46879826a
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      src/processarc.c

+ 4 - 4
src/processarc.c

@@ -531,10 +531,6 @@ void process_archive(const char *filename) {
       return;
       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. */
   /* Deconfigure other instances from a pkgset if they are not in sync. */
   for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
   for (otherpkg = &pkg->set->pkg; otherpkg; otherpkg = otherpkg->arch_next) {
     if (otherpkg == pkg)
     if (otherpkg == pkg)
@@ -546,6 +542,10 @@ void process_archive(const char *filename) {
       enqueue_deconfigure(otherpkg, NULL);
       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) {
   for (dsearch= pkg->available.depends; dsearch; dsearch= dsearch->next) {
     switch (dsearch->type) {
     switch (dsearch->type) {
     case dep_conflicts:
     case dep_conflicts: