From 423e97ff39873fe4c6cbf6b6bfe3bcb666f2b3e7d39a9c00b7105428246d4349 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 26 Aug 2016 10:03:39 +0000
Subject: [PATCH] Accepting request 423023 from
 home:jordimassaguerpla:branch:V:c:fix_migration_code_again

- fix bsc#995102 - Docker "migrator" prevents installing "docker",
  if docker 1.9 was installed before but there were no images

OBS-URL: https://build.opensuse.org/request/show/423023
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=133
---
 docker.changes | 6 ++++++
 docker.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker.changes b/docker.changes
index b4668d6..774b59e 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 26 10:00:36 UTC 2016 - jmassaguerpla@suse.com
+
+- fix bsc#995102 - Docker "migrator" prevents installing "docker",
+  if docker 1.9 was installed before but there were no images
+
 -------------------------------------------------------------------
 Fri Aug 26 08:49:15 UTC 2016 - asarai@suse.com
 
diff --git a/docker.spec b/docker.spec
index 7415733..f58240a 100644
--- a/docker.spec
+++ b/docker.spec
@@ -333,7 +333,7 @@ install -D -m 0644 %{SOURCE9} %{buildroot}%{docker_migration_warnfile}
 #    will stick around if it has been migrated -- which is why we need the
 #    MIGRATION_TESTFILE check).
 # 4. Check that there are images in the graph/ directory.
-if [[ -d "%{docker_store}" && -n "$(find "%{docker_store}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_store}$')" ]]; then
+if [[ -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_graph}$')" ]]; then
     # Check if currently installed version of docker is old enough to need migration.
     CURRENT_DOCKER_VERSION=$(docker -v | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
     # This variable will contain the current docker version if migration is needed otherwise it will contain the upgrade point.