[Pkg-libvirt-commits] [libvirt-sandbox] 21/42: docker: rename destdir to templatedir

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch debian/experimental
in repository libvirt-sandbox.

commit 0a3ef70c517ccce159cec28cf80302d0e39dc2d4
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Mon Jul 11 16:21:57 2016 +0100

    docker: rename destdir to templatedir
    
    Use the more common naming for the variable pointing to
    the template directory
    
    Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt-sandbox.git