From 5f238cfa5122fefbee7769e36fd07df060a85b4c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 2 Dec 2017 12:53:52 -0500
Subject: 0.23.0 make image list available early for sisupod

- have information needed for building source pods available early
- don't do extra scan (for images) unless building of source pod
  requested
---
 src/sdp/sdp.d | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/sdp/sdp.d')

diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index 30f8d03..f4d738f 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -302,19 +302,19 @@ void main(string[] args) {
     "pwd" : environment["PWD"],
     "home" : environment["HOME"],
   ];
-  auto _manifest = PodManifest!()();
-  auto _manifest_plus = PodMatters!()(_opt_action, _env);
-  auto _manifests = [ _manifest_plus ];
+  auto _manifest_start = PodManifest!()();
+  auto _manifest_matter = PodMatters!()(_opt_action, _env);
+  auto _manifests = [ _manifest_matter ];
   foreach(arg; args[1..$]) {
-    _manifest = PodManifest!()(arg);
+    _manifest_start = PodManifest!()(arg);
     if (arg.match(rgx.flag_action)) {
       flag_action ~= " " ~ arg;   // flags not taken by getopt
     } else if (arg.match(rgx.src_pth)) {
       _manifests ~= PodMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing
-    } else if (_manifest.pod_manifest_file_with_path) {
+    } else if (_manifest_start.pod_manifest_file_with_path) {
       string contents_location_raw_;
       string contents_location_;
-      string sisudoc_txt_ = _manifest.pod_manifest_file_with_path;
+      string sisudoc_txt_ = _manifest_start.pod_manifest_file_with_path;
       enforce(
         exists(sisudoc_txt_)!=0,
         "file not found: «" ~
@@ -353,8 +353,8 @@ void main(string[] args) {
           || (contents_location_pth_).match(lang_rgx_)
         ) {
           auto _fns = (((tmp_dir_).chainPath(contents_location_pth_)).array).to!(string);
-          _manifest_plus = PodMatters!()(_opt_action, _env, arg, _fns, contents_locations_arr);
-          _manifests ~= _manifest_plus; // TODO how to capture?
+          _manifest_matter = PodMatters!()(_opt_action, _env, arg, _fns, contents_locations_arr);
+          _manifests ~= _manifest_matter; // TODO how to capture?
         }
       }
     } else if (arg.match(rgx.src_pth_zip)) {
@@ -367,7 +367,7 @@ void main(string[] args) {
   if (!(_opt_action.skip_output)) {
     outputHubOp!()(_opt_action);
   }
-  if (_manifests.length > 1) { // _manifests[0] is dummy element used in initialization to be removed
+  if (_manifests.length > 1) { // _manifests[0] initialized dummy element
     foreach(manifest; _manifests[1..$]) {
       if (!empty(manifest.src_fn)) {
         scope(success) {
-- 
cgit v1.2.3