Browse code

Rename MULLE_FLAG_MERGE_LOG to MULLE_FLAG_LOG_MERGHE

Nat! authored on 03-05-2017 22:57:04
Showing 5 changed files
... ...
@@ -304,7 +304,7 @@ bootstrap_main()
304 304
    local MULLE_FLAG_LOG_SCRIPTS="NO"
305 305
    local MULLE_FLAG_LOG_SETTINGS="NO"
306 306
    local MULLE_FLAG_LOG_VERBOSE="NO"
307
-   local MULLE_FLAG_MERGE_LOG="NO"
307
+   local MULLE_FLAG_LOG_MERGE="NO"
308 308
    local MULLE_TRACE_PATHS_FLIP_X="NO"
309 309
    local MULLE_TRACE_POSTPONE="NO"
310 310
    local MULLE_TRACE_RESOLVER_FLIP_X="NO"
... ...
@@ -121,7 +121,7 @@ _dependency_resolve()
121 121
    local map="$1"
122 122
    local name="$2"
123 123
 
124
-   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
124
+   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
125 125
    then
126 126
       log_trace2 "resolve ${name}"
127 127
    fi
... ...
@@ -129,7 +129,7 @@ bootstrap_technical_flags()
129 129
       ;;
130 130
 
131 131
       -lm|--log-merge)
132
-         MULLE_FLAG_MERGE_LOG="YES"
132
+         MULLE_FLAG_LOG_MERGE="YES"
133 133
       ;;
134 134
 
135 135
       -ls|--log-settings)
... ...
@@ -1021,7 +1021,7 @@ merge_repository_contents()
1021 1021
    local url
1022 1022
    local name
1023 1023
 
1024
-   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1024
+   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1025 1025
    then
1026 1026
       log_trace2 "Merging repositories \"${additions}\" into \"${contents}\""
1027 1027
    fi
... ...
@@ -1043,7 +1043,7 @@ merge_repository_contents()
1043 1043
       url="`_url_part_from_clone "${clone}"`"
1044 1044
       name="`_canonical_clone_name "${url}"`"
1045 1045
 
1046
-      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1046
+      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1047 1047
       then
1048 1048
          log_trace2 "${name}: ${clone}"
1049 1049
       fi
... ...
@@ -1060,7 +1060,7 @@ merge_repository_contents()
1060 1060
       url="`_url_part_from_clone "${clone}"`"
1061 1061
       name="`_canonical_clone_name "${url}"`"
1062 1062
 
1063
-      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1063
+      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1064 1064
       then
1065 1065
          log_trace2 "${name}: ${clone}"
1066 1066
       fi
... ...
@@ -1069,7 +1069,7 @@ merge_repository_contents()
1069 1069
    done
1070 1070
    IFS="${DEFAULT_IFS}"
1071 1071
 
1072
-   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1072
+   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1073 1073
    then
1074 1074
       log_trace2 "----------------------"
1075 1075
       log_trace2 "merged \"repositories\":"
... ...
@@ -1123,7 +1123,7 @@ unique_repository_contents()
1123 1123
    local name
1124 1124
    local output
1125 1125
 
1126
-   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1126
+   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1127 1127
    then
1128 1128
       log_trace2 "Uniquing \"${input}\" with \"${another}\""
1129 1129
    fi
... ...
@@ -1154,7 +1154,7 @@ unique_repository_contents()
1154 1154
    done
1155 1155
    IFS="${DEFAULT_IFS}"
1156 1156
 
1157
-   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1157
+   if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1158 1158
    then
1159 1159
       log_trace2 "----------------------"
1160 1160
       log_trace2 "uniqued \"repositories\":"
... ...
@@ -1225,7 +1225,7 @@ sort_repository_file()
1225 1225
       refreshed="${refreshed}
1226 1226
 ${clone}"
1227 1227
 
1228
-      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1228
+      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1229 1229
       then
1230 1230
          log_trace2 "Sort is dealing with \"${clone}\" now"
1231 1231
       fi
... ...
@@ -1252,7 +1252,7 @@ ${clone}"
1252 1252
 
1253 1253
       if [ ! -d "${stashdir}" ]
1254 1254
       then
1255
-         if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1255
+         if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1256 1256
          then
1257 1257
             log_trace2 "${stashdir} not fetched yet"
1258 1258
          fi
... ...
@@ -1270,7 +1270,7 @@ ${clone}"
1270 1270
       then
1271 1271
          sub_repos="`unique_repository_contents "${sub_repos}" "${clones}"`"
1272 1272
          dependency_map="`dependency_add_array "${dependency_map}" "${clone}" "${sub_repos}"`"
1273
-         if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1273
+         if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1274 1274
          then
1275 1275
             log_trace2 "add \"${clone}\" to __ROOT__ as dependencies"
1276 1276
             log_trace2 "add [ ${sub_repos} ] to ${clone} as dependencies"
... ...
@@ -1290,7 +1290,7 @@ ${clone}"
1290 1290
    repositories="`dependency_resolve "${dependency_map}" "__ROOT__" | fgrep -v -x "__ROOT__"`"
1291 1291
    if [ ! -z "${repositories}" ]
1292 1292
    then
1293
-      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
1293
+      if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
1294 1294
       then
1295 1295
          log_trace2 "------------------------"
1296 1296
          log_trace2 "resolved \"repositories\":"
... ...
@@ -814,7 +814,7 @@ ${result}"
814 814
    IFS="${DEFAULT_IFS}"
815 815
 
816 816
    if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o \
817
-        "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
817
+        "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
818 818
    then
819 819
       log_trace2 "----------------------"
820 820
       log_trace2 "Merged settings:      "
... ...
@@ -852,7 +852,7 @@ ${result}"
852 852
    IFS="${DEFAULT_IFS}"
853 853
 
854 854
    if [ "$MULLE_FLAG_LOG_SETTINGS" = "YES" -o \
855
-        "$MULLE_FLAG_MERGE_LOG" = "YES"  ]
855
+        "$MULLE_FLAG_LOG_MERGE" = "YES"  ]
856 856
    then
857 857
       log_trace2 "----------------------"
858 858
       log_trace2 "Merged settings:      "