[PATCH sandbox 12/24] docker: rename destdir to templatedir

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use the more common naming for the variable pointing to
the template directory

Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 libvirt-sandbox/image/sources/docker.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py
index fc2faf2..57256f3 100644
--- a/libvirt-sandbox/image/sources/docker.py
+++ b/libvirt-sandbox/image/sources/docker.py
@@ -288,17 +288,17 @@ class DockerSource(base.Source):
                                  connect)
             parentImage = templateImage
 
-    def _get_image_list(self, template, destdir):
+    def _get_image_list(self, template, templatedir):
         imageparent = {}
         imagenames = {}
-        imagedirs = os.listdir(destdir)
+        imagedirs = os.listdir(templatedir)
         for imagetagid in imagedirs:
-            indexfile = destdir + "/" + imagetagid + "/index.json"
+            indexfile = templatedir + "/" + imagetagid + "/index.json"
             if os.path.exists(indexfile):
                 with open(indexfile,"r") as f:
                     index = json.load(f)
                 imagenames[index["name"]] = imagetagid
-            jsonfile = destdir + "/" + imagetagid + "/template.json"
+            jsonfile = templatedir + "/" + imagetagid + "/template.json"
             if os.path.exists(jsonfile):
                 with open(jsonfile,"r") as f:
                     data = json.load(f)
-- 
2.7.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]