From 1b58d31ef7fa94e5b3dbeff49efb790ea288585d Mon Sep 17 00:00:00 2001
From: Tomas Mlcoch <tmlcoch@redhat.com>
Date: Mon, 24 Feb 2014 13:49:48 +0100
Subject: [PATCH] DeltaRepo: Implemented apply_resolved_path

---
 deltarepo/deltarepo.py                             |   2 +-
 deltarepo/deltarepo/applicator.py                  |   2 +-
 deltarepo/deltarepo/updater_common.py              |  77 +++++++++-----------
 deltarepo/example/test.sh                          |   2 +-
 deltarepo/example/test/repo1/foobar-1              |   1 -
 deltarepo/example/test/repo1/gen.sh                |  18 -----
 deltarepo/example/test/repo1/group.xml             |   5 --
 deltarepo/example/test/repo1/pkglist               |   2 -
 ...d2e73dabf8298f94e415d12d3b847682752-foobar-1.gz | Bin 29 -> 0 bytes
 ...b8ec65ab34b929a6cd234f5b0e3e4f-other.sqlite.bz2 | Bin 933 -> 0 bytes
 ...2a7085c6d45f05a09da5ef4e4c80c8828b-group.xml.gz | Bin 141 -> 0 bytes
 ...fdfc6d074379e7c9e8311f9fde249407-primary.xml.gz | Bin 1060 -> 0 bytes
 ...b29cd8cb1df8e5ca0f2ec56436-filelists.sqlite.bz2 | Bin 927 -> 0 bytes
 ...cf8950708e0b3db8af3ee68f31dd0a38c2-other.xml.gz | Bin 438 -> 0 bytes
 ...d6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml |   5 --
 ...acf64f684d6e16c9ae5be16094a7-primary.sqlite.bz2 | Bin 2376 -> 0 bytes
 ...14e6bca12864032c019dcce9614d81-filelists.xml.gz | Bin 370 -> 0 bytes
 deltarepo/example/test/repo1/repodata/repomd.xml   |  80 ---------------------
 deltarepo/example/test/repo3/comps.xml             |   5 --
 deltarepo/example/test/repo3/foobar                |   1 -
 deltarepo/example/test/repo3/gen.sh                |  18 -----
 deltarepo/example/test/repo3/pkglist               |   5 --
 ...25d2e73dabf8298f94e415d12d3b847682752-foobar.gz | Bin 29 -> 0 bytes
 ...4edd20a05e493c7b9123fd4cd43ed27b45-other.xml.gz | Bin 743 -> 0 bytes
 ...2a7085c6d45f05a09da5ef4e4c80c8828b-comps.xml.gz | Bin 141 -> 0 bytes
 ...b065bfe0cf56f45bbebd6dd92b08-primary.sqlite.bz2 | Bin 3439 -> 0 bytes
 ...034760e616e11fbaaf0517e1ea877f-other.sqlite.bz2 | Bin 1322 -> 0 bytes
 ...1d5de9d93ca81537eda34ccef4-filelists.sqlite.bz2 | Bin 1217 -> 0 bytes
 ...d6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml |   5 --
 ...a369b5fb2cad87d880f664fa815e3f-filelists.xml.gz | Bin 560 -> 0 bytes
 ...99cbe3c0817edd7336febc96b95ece33-primary.xml.gz | Bin 1740 -> 0 bytes
 deltarepo/example/test/repo3/repodata/repomd.xml   |  80 ---------------------
 deltarepo/repocontenthash.py                       |   4 +-
 deltarepo/repoupdater.py                           |   1 -
 34 files changed, 40 insertions(+), 273 deletions(-)
 delete mode 100644 deltarepo/example/test/repo1/foobar-1
 delete mode 100755 deltarepo/example/test/repo1/gen.sh
 delete mode 100644 deltarepo/example/test/repo1/group.xml
 delete mode 100644 deltarepo/example/test/repo1/pkglist
 delete mode 100644 deltarepo/example/test/repo1/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar-1.gz
 delete mode 100644 deltarepo/example/test/repo1/repodata/0e43813b2bf4a47abcafa39072c0bc3279b8ec65ab34b929a6cd234f5b0e3e4f-other.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo1/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-group.xml.gz
 delete mode 100644 deltarepo/example/test/repo1/repodata/4b4a98a3883ca24ecda5cb105f9c162dfdfc6d074379e7c9e8311f9fde249407-primary.xml.gz
 delete mode 100644 deltarepo/example/test/repo1/repodata/64e015b633e6cac5193a0a44403162cf90c39bb29cd8cb1df8e5ca0f2ec56436-filelists.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo1/repodata/a5ad5ae1f43eae9e8e1b3fb6ee93e2cf8950708e0b3db8af3ee68f31dd0a38c2-other.xml.gz
 delete mode 100644 deltarepo/example/test/repo1/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml
 delete mode 100644 deltarepo/example/test/repo1/repodata/a81604899900f2f58ead1e4a1d903700efe7acf64f684d6e16c9ae5be16094a7-primary.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo1/repodata/fac6a651423edc252a488b74995641ec4514e6bca12864032c019dcce9614d81-filelists.xml.gz
 delete mode 100644 deltarepo/example/test/repo1/repodata/repomd.xml
 delete mode 100644 deltarepo/example/test/repo3/comps.xml
 delete mode 100644 deltarepo/example/test/repo3/foobar
 delete mode 100755 deltarepo/example/test/repo3/gen.sh
 delete mode 100644 deltarepo/example/test/repo3/pkglist
 delete mode 100644 deltarepo/example/test/repo3/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar.gz
 delete mode 100644 deltarepo/example/test/repo3/repodata/07125d910a68f01ac92f37921aa7fb4edd20a05e493c7b9123fd4cd43ed27b45-other.xml.gz
 delete mode 100644 deltarepo/example/test/repo3/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-comps.xml.gz
 delete mode 100644 deltarepo/example/test/repo3/repodata/5b18db33715f9cbdd50e72b14af24476bad7b065bfe0cf56f45bbebd6dd92b08-primary.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo3/repodata/609eca035393772a53575fa2792c238277034760e616e11fbaaf0517e1ea877f-other.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo3/repodata/7946a0f6e1676a33f763e12eddf0ce805c15a81d5de9d93ca81537eda34ccef4-filelists.sqlite.bz2
 delete mode 100644 deltarepo/example/test/repo3/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml
 delete mode 100644 deltarepo/example/test/repo3/repodata/e6c1900810fb1155e7a29c59df839e9d20a369b5fb2cad87d880f664fa815e3f-filelists.xml.gz
 delete mode 100644 deltarepo/example/test/repo3/repodata/f209787b500f81fc59f7babcfaa122db99cbe3c0817edd7336febc96b95ece33-primary.xml.gz
 delete mode 100644 deltarepo/example/test/repo3/repodata/repomd.xml

diff --git a/deltarepo/deltarepo.py b/deltarepo/deltarepo.py
index c375a50..44fff41 100755
--- a/deltarepo/deltarepo.py
+++ b/deltarepo/deltarepo.py
@@ -31,7 +31,7 @@ def parse_options():
     #parser.add_option("-l", "--list-datatypes", action="store_true",
     #                  help="List datatypes for which delta is supported.")
     parser.add_argument("-o", "--outputdir", action="store", metavar="DIR",
-                      help="Output directory.", default="./")
+                      help="Output directory.", default=None)
     parser.add_argument("-d", "--database", action="store_true",
                       help="Force database generation")
     parser.add_argument("--ignore-missing", action="store_true",
diff --git a/deltarepo/deltarepo/applicator.py b/deltarepo/deltarepo/applicator.py
index fcd675d..081a02b 100644
--- a/deltarepo/deltarepo/applicator.py
+++ b/deltarepo/deltarepo/applicator.py
@@ -357,7 +357,7 @@ class DeltaRepoApplicator(LoggingInterface):
 
         # Final move
         if os.path.exists(self.final_path):
-            self._warning("Destination dir already exists! Removing %s" % \
+            self._debug("Destination dir already exists! Removing %s" % \
                           self.final_path)
             shutil.rmtree(self.final_path)
         self._debug("Moving %s -> %s" % (self.new_repodata_path, self.final_path))
diff --git a/deltarepo/deltarepo/updater_common.py b/deltarepo/deltarepo/updater_common.py
index 3e5306d..b8514c4 100644
--- a/deltarepo/deltarepo/updater_common.py
+++ b/deltarepo/deltarepo/updater_common.py
@@ -2,6 +2,7 @@ import shutil
 import os
 import pprint
 import os.path
+import time
 import librepo
 import tempfile
 import createrepo_c as cr
@@ -533,61 +534,53 @@ class Updater(LoggingInterface):
 
     def apply_resolved_path(self, resolved_path):
         # TODO: Make it look better (progressbar, etc.)
-        counter = 0
+        counter = 1
         tmpdir = tempfile.mkdtemp(prefix="deltarepos-", dir="/tmp")
-        targetrepo = tempfile.mkdtemp(prefix="targetrepo", dir=tmpdir)
-        self._debug("Using temporary dir for downloading: {0}".format(tmpdir))
+        tmprepo = tempfile.mkdtemp(prefix="targetrepo", dir=tmpdir)
+        prevrepo = self.localrepo.path
+
+        self._debug("Using temporary directory: {0}".format(tmpdir))
         for link in resolved_path:
 
             # Download repo
-            print("Downloading delta repo {0}".format(link.deltarepourl))
+            self._info("{0:2}/{1:<2} Downloading delta repo {2}".format(
+                counter, len(resolved_path), link.deltarepourl))
             dirname = "deltarepo_{0:02}".format(counter)
             destdir = os.path.join(tmpdir, dirname)
             os.mkdir(destdir)
             repo = Updater.DownloadedRepo(link.deltarepourl)
             repo.download(destdir)
-            counter += 1
 
             # Apply repo
-            da = DeltaRepoApplicator(self.localrepo.path,
+            self._info("{0:2}/{1:<2} Applying delta repo".format(
+                counter, len(resolved_path)))
+            da = DeltaRepoApplicator(prevrepo,
                                      destdir,
-                                     out_path=targetrepo,
+                                     out_path=tmprepo,
                                      logger=self.logger,
                                      ignore_missing=True)
             da.apply()
 
-    # def update(self, target_contenthash, target_contenthash_type="sha256"):
-    #     """Transform the localrepo to the version specified
-    #     by the target_contenthash"""
-    #
-    #     if not self.localrepo.contenthash or not self.localrepo.contenthash_type:
-    #         raise DeltaRepoError("content hash is not specified in localrepo")
-    #
-    #     if self.localrepo.contenthash_type != target_contenthash_type:
-    #         raise DeltaRepoError("Contenthash type mishmash - LocalRepo {0}, "
-    #                              "Target: {1}".format(self.localrepo.contenthash_type,
-    #                                                   target_contenthash_type))
-    #
-    #     resolved_path = self.updatesolver.resolve_path(self.localrepo.contenthash,
-    #                                                    target_contenthash,
-    #                                                    target_contenthash_type)
-    #
-    #     if not resolved_path:
-    #         raise DeltaRepoError("Path \'{0}\'->\'{1}\' ({2}) cannot "
-    #                              "be resolved".format(self.localrepo.contenthash,
-    #                                                   target_contenthash,
-    #                                                   target_contenthash_type))
-    #
-    #     self.apply_resolved_path(resolved_path)
-
-    #def update_to_current(self, originrepo):
-    #    target_contenthash_type = self.localrepo.contenthash_type
-    #    _, target_contenthash = self.find_repo_contenthash(originrepo,
-    #                                                       target_contenthash_type)
-    #    if not target_contenthash:
-    #        raise DeltaRepoError("Cannot determine contenthash ({0}) "
-    #                             "of originrepo".format(target_contenthash_type))
-    #
-    #    self.update(target_contenthash,
-    #                target_contenthash_type=target_contenthash_type)
-    #
+            counter += 1
+            prevrepo = tmprepo
+
+        # Move updated repo to the final destination
+        dirname = os.path.dirname(self.localrepo.path)
+        basename = ".deltarepo-repodata-{0}-{1}".format(time.time(), os.getpid())
+        targettmprepodata = os.path.join(dirname, basename)
+        originaltmprepodata = targettmprepodata+"-original"
+        tmprepodata = os.path.join(tmprepo, "repodata")
+        originalrepodatapath = os.path.join(self.localrepo.path, "repodata")
+
+        self._debug("Final move to {0}".format(self.localrepo.path))
+
+        self._debug("Copying {0} -> {1}".format(tmprepodata, targettmprepodata))
+        shutil.copytree(tmprepodata, targettmprepodata)
+        self._debug("Moving {0} -> {1}".format(originalrepodatapath, originaltmprepodata))
+        shutil.move(originalrepodatapath, originaltmprepodata)
+        self._debug("Moving {0} -> {1}".format(targettmprepodata, originalrepodatapath))
+        shutil.move(targettmprepodata, originalrepodatapath)
+        self._debug("Removing {0}".format(originaltmprepodata))
+        shutil.rmtree(originaltmprepodata)
+        self._debug("Removing {0}".format(tmpdir))
+        shutil.rmtree(tmpdir)
diff --git a/deltarepo/example/test.sh b/deltarepo/example/test.sh
index 130aff5..12239f0 100755
--- a/deltarepo/example/test.sh
+++ b/deltarepo/example/test.sh
@@ -5,4 +5,4 @@ mkdir test/
 cp -r repos/repo1 test/
 cp -r repos/repo3 test/
 
-../repoupdater.py test/repo1/ --verbose --repo file://`pwd`/test/repo3/ --drmirror file://`pwd`/deltarepos/
+../repoupdater.py test/repo1/ $@ --repo file://`pwd`/test/repo3/ --drmirror file://`pwd`/deltarepos/
diff --git a/deltarepo/example/test/repo1/foobar-1 b/deltarepo/example/test/repo1/foobar-1
deleted file mode 100644
index 76fc659..0000000
--- a/deltarepo/example/test/repo1/foobar-1
+++ /dev/null
@@ -1 +0,0 @@
-a content
\ No newline at end of file
diff --git a/deltarepo/example/test/repo1/gen.sh b/deltarepo/example/test/repo1/gen.sh
deleted file mode 100755
index c3eb7a0..0000000
--- a/deltarepo/example/test/repo1/gen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-MY_DIR=`dirname $0`
-
-if [[ -z "$CREATEREPO" ]]
-then
-    CREATEREPO="createrepo_c"
-fi
-
-if [[ -z "$MODIFYREPO" ]]
-then
-    MODIFYREPO="modifyrepo_c"
-fi
-
-pushd "$MY_DIR"
-$CREATEREPO $EXTRAARGS --pkglist pkglist --groupfile group.xml --revision "1st repo" --content "A content tag" .
-$MODIFYREPO --mdtype="foobar"  foobar-1 repodata/
-popd
diff --git a/deltarepo/example/test/repo1/group.xml b/deltarepo/example/test/repo1/group.xml
deleted file mode 100644
index 068519c..0000000
--- a/deltarepo/example/test/repo1/group.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-<!-- -->
-</comps>
diff --git a/deltarepo/example/test/repo1/pkglist b/deltarepo/example/test/repo1/pkglist
deleted file mode 100644
index 8f68735..0000000
--- a/deltarepo/example/test/repo1/pkglist
+++ /dev/null
@@ -1,2 +0,0 @@
-../packages/Archer-3.4.5-6.x86_64.rpm
-../packages/fake_bash-1.1.1-1.x86_64.rpm
diff --git a/deltarepo/example/test/repo1/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar-1.gz b/deltarepo/example/test/repo1/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar-1.gz
deleted file mode 100644
index f2aeb4456eded51c557d87ea88d9234cd98094d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29
gcmb2|=3oE=X73P>bLX`^&uTL=oZvZU&IuF+09#iEi2wiq

diff --git a/deltarepo/example/test/repo1/repodata/0e43813b2bf4a47abcafa39072c0bc3279b8ec65ab34b929a6cd234f5b0e3e4f-other.sqlite.bz2 b/deltarepo/example/test/repo1/repodata/0e43813b2bf4a47abcafa39072c0bc3279b8ec65ab34b929a6cd234f5b0e3e4f-other.sqlite.bz2
deleted file mode 100644
index a4bef99a2f6d3047a2e2f07d11ce5f0a3a3fb188..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 933
zcmV;W16uq-T4*&fL0KkKS?p{}r~m<>|KI=efQsaQ|L_0*{OP~{-{_zN0tX;?Km-B_
z0R#|?Km!yxhS6(H2}!7GXv&|JHcY0;lT$;~^qy1FF%K!}Hlx~_fM@_cMn|M*dYUx!
zhG->C36o4hH3;<$lmGx2KmY?kGz|b58fa)eKyUyW00EEy00u)wfB*mh00009LJ?0R
zDe0z?c?fz<1Ju!kGBf~bp`d8Q14C+Q>KOr}LtM}3tuzDlo}X9O9>(J6t#Mq%3RKZk
zol=yYyFpmci4u?u5GOK|%Q}OMa^23(4BZM)XhiFrx;A5oiEr(Hw>7LiUOdix%iFIM
zu<ri9nI>?udP2jB4m_@-&0_MJuIE<U3{{<#m(4N>kHOMshn(76$A{&^SyIN6=(`SG
zuZj$UMqQe$wBoWZ;>yz$rc2sW*F(i1UmT~^Rq_S|*J1Sz2E&Dw+Aw&d`T4#MJ-scH
z>go4iS=HTBXwj2t@lAf8Jg`^9<s_oRe6K+Z_EfKTD3pHzqfQd3zpP&F%W<9$7<B<X
z<su*(8s?YKv`6SM(q#sbh%O*N(kmoDffH_EovjyX%`?){*q6r>7*ar>l*Y8C2#Hwn
z*UQkP)o-E9N=B8E99(DeZ64Dod0mJ&iBTcN@&&^v9$2v)ghV7%Fk%*s8bqjgypg1c
zF{KiytCx9WYbtnHSV&g0M^=IzF!*QH<Hl+QbbqO2MfoImwjr%+PNj^mO@~o3&6)-T
z&O~6preQnchTLQah7Gvwsd7b33%M}(2~c<0P>m%UcIjh<@M5C|upo6cOG^&^v*?&a
zpTCNKMnHidbYlXjHPIr`^X@wMlUZ|!oe|bf4AS9q8jUX)6NM3`$n#SoBW)m;L;BTm
z3=`&2*}oX*t&n0yNQ-8Vbu@~lD-sSLss@ppRU$9wY&1uHz|IWBYekhJE{jenuB{vk
zJVFGrFy2g!n3J@xB$3c16n{mUW`PW=6Ka*3!3>M8jSx~Mkx?uiR5->tNnpq)YMfY1
zGKYpCMKkGvBuEPC37HBe^Q0h3VhL_=Elqsto}Pk5SFT9uQ7rFepgT}9!pzr`5s?g?
z*a1yJ0oKrs1f95qz$~bP+!n$dc%_`RaztsE<y6SoRBMCEYd;8_RTyqiv~t+977~iY
zQRm0|i(`WrS^S9?=s?ST<r!!hn;N5XMd~m2Q5fH%D(r{(+G?k+I0MlUf8y>)rwS4s
Hjfr&tQ<te5

diff --git a/deltarepo/example/test/repo1/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-group.xml.gz b/deltarepo/example/test/repo1/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-group.xml.gz
deleted file mode 100644
index 6a703aba38277ee1e296905ea51becb2fcf5bd23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmb2|=3oE==FJ<|pEw(+;jOE6?#%hkp+;AX1A;uxdY|(@dB%HtC>L+x<*fmmwm;q!
zSn{!)ual=B)Z^TFU5zjfj?zybOTq#!UA@ll<s10HL+4`Phcn*SE?+O_EDS7QTMg8H
t`ug?qufah9Oxc&bH9Z5Fq*$Ld^jx_bdf_Uo(U*lv3@RPvjXgkD001Q2KJx$o

diff --git a/deltarepo/example/test/repo1/repodata/4b4a98a3883ca24ecda5cb105f9c162dfdfc6d074379e7c9e8311f9fde249407-primary.xml.gz b/deltarepo/example/test/repo1/repodata/4b4a98a3883ca24ecda5cb105f9c162dfdfc6d074379e7c9e8311f9fde249407-primary.xml.gz
deleted file mode 100644
index 86817d1ae40f340ce3478d5243f3dab01780548d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmV+<1l#)`iwFP!000001GQIOkE1peecxY!{Iq=t1_FkR2&<}{U9GeatulS+Q)J*0
zPykaKqM82s+I)m$GBG>bRwK<A``qjM;bWf(KRs8aaRM$1R&SAQTF8JpVQEnxw&;(i
z&#M4^iavxDv^1qHH6*+iTa>qL^MG+#)ZMe0c1JKF?eK)c39BkrqXGTEn`+TQVvy0$
z<VX)7{X0l*I({1MO9NY^5YY$22y0qF^fOO#;34im)GU<~(Q`od#0_!(p=QU-3}{%A
zE4M1wEn1td=^=wdxkUuw9xDAMN6}T|b|R;aM`TRLLy>OLpN~5fxnRY<?>UZ@5I?gr
zC$Y2Cv3(ziL*h*mkTtb7fxWgI$IUWp<NE=m;CKnp4c$P9r%n1D<==|(m*^K(H6=Vx
z>6;;*Run1)k?^8vWg27F6EMV=YYICq@MzZpm!&=!Q=QH$3fA#58v7v_+b6^R`)PmZ
zaEKK~VcVhtBP&W-5_?So*Cm!`BO~sLGVP~4*CuXYja3xI-!R1|>ug&RThyYZWeE~5
zkC*CAagvLk>yAbxOQ_1h$T?(NWSUdB0uS-8`i8BDIW*W*XJIhS7_VrnhVnyBKa@oR
zwSef$Z{I?EIWa>{P^XMXUw2=317w_-5eLq?Ci)dlP_m|iy2Ve7m0~~-i!-<{Mb1PU
zsXR(GGW$`=Dq7To(F~dm1?zYMaumJFQt(8jI9Sf8*)j*3N<62vq=zgnZ{^tzdhVub
zM7*IqBfR14RLHY3OpTK=EB<0A{%lc9IYmZR(u3sQw?{Pb#TxnIIFrA(jpMWNms?}o
zHXX-YuSdR3UBBlmIs1D2{l=H{qBTzEES_$Rmv)9Zi(6yQ(-;r^dn<6wjid4OQJ(V^
zaesQZ$Kl9a_q*SN!(Uy&HAf(0On(G4K}%cx2{0}7u=JtYdO!N^>uvST*W2oQueZ%~
zF{>wp!$sahi>~|8drerK$;+zM&@^6Psh+3t0!@3O_EfzftDZFR0$cTbjTh*;u=fIA
zXT}aCe^uY!A&Uhoq1Et$(xsYfVx)Ab<fbh5RBNrHr9x|sm+GuFUMll-m0wjfRMH{B
zo!~ewYCK5|8sdIIJ>htI!_O*ZLHlL&2>Y0d{JrvTzK`V3^?md`@^52h#0JkLn{_~K
z+jTdwF9i;<XzFZSVh7ZV)3rq$a7h*<S>Q=|Xjwr(Gdpl&|Bn3oEYmTDbnfZCGvqs@
z-+irjuG?PZP?n}_#yf=G+9kdfxXznG&vDlNU7@E6xhV9`!L9o4$lw2^*3;^|-HT|U
zG9K$w!CBqQy`3u1|EKqEll`}n&+`2DN<NY6p0z1L-L>-ukMz!Tx<>2t$90Y98sPgQ
e@ES_(6MTJ9UEDGHi|YI@Z1fKsY-ol|4*&p2f)srK

diff --git a/deltarepo/example/test/repo1/repodata/64e015b633e6cac5193a0a44403162cf90c39bb29cd8cb1df8e5ca0f2ec56436-filelists.sqlite.bz2 b/deltarepo/example/test/repo1/repodata/64e015b633e6cac5193a0a44403162cf90c39bb29cd8cb1df8e5ca0f2ec56436-filelists.sqlite.bz2
deleted file mode 100644
index 2d4d227df2190f8f29c32de14edcb345a481ed50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 927
zcmV;Q17Q3@T4*&fL0KkKSrxq400059|NsB?pz6Z!|LXtm{Ncav|7b7(00amFL^uKf
z1_=QqIE+989S8~l2tfqGWSVB6^%)N+8K?klLqKTIXahiGG<uq7Jwb?Y01W^GKx6;_
z4FCbAfB*mh4FEU*27m#eG5`PufB@4#00006fC)qsMwuo`ep5w15u%5bdY+*59-5h{
zvWA*HPf6&229HzJXk;3Ck5TCz2K5Qbpr2>k&-(bk%=j0{j3r}KKnoQts&ky@4Yfr3
zBEZ2#U?2#C1eAeev|<`_@hDwjhMPqnXs$AF{m*59V6JgF4Mgfuj_QwAj2ExW39_qL
z_*>+j>iu3qV#XkTVwTO6Z64VLHHje;iRU`rYtE-=sj8|}pFRY}*(n2<iYU6XOgV}M
zzEMpC2Z;h(=&$@Ch#OmGi(R46B#?#qX`%=w1w4_WVQr>tq7%W2WeT$C(hl(5eidS$
z>eJy}uyN^l;i3C9u|KxG>gdgt{>-%ZTvGqN^ebM~CAEV@)$!%7)|cx=rR?cU{HgaP
zTZ6)|P}ey(aW$k5P^KhQ@E4!S%vf^{InI9h1YyfErbMWyaMdL8Wd(yu2e^F56;e}V
zN11t&1PNMDOYlY%B;H7wZPu3*-@wU}oFGy@B%xU0l@6rFK*U8Xjv@lqL8h0GEEJJ3
zqg2FWc=HiiULw2-3sMDUPPE99wm~a}Ehf`fCXMXc$*}#FB7P>Dza;bZxA>ozJsg|*
zs7JV6;fhO8$Pfzx@PHIx+z5uC0bL+KP9b5mm$#lOe+$uI=m~%-p@}FwI-W?{tOZA^
zMx-)yJWcLIOZqx5&%}jkQ;}3Nr4B@J6J6^%w^6>Tb`HV0*I~Z{eC?-asS~nv(tpU0
z<3rO7TzoPqh}#csB+YYxI8px!UW~pY<WXf9M6k`=O-Q0j_-!XvK%kk1DMz}uDI{~3
zJ^?rr)6BTSW(GsHa1PVY;ut?xS~Cm;kfW2=rBJh7SgP|9dniovv&U4%G}jDf!PBdN
zX&u8;M;3(HR<VUByC)Us8h0XfIw5c_d<0FTbo;GhQIs<XaX}JR?Px%EqimH`5LI>p
z9XCY=kf2v1RiIp03o6{*g4!reI<*>Y+{9-kSs;-EbuJ2RmDYtIn}G@&)&b%fcnJvw
zJiZR}9AO$p$POC}v?3P#TO4BP3)f#P(aNo09@AOhRw(602n+v<xgwk>NDAI;006&<
BniT*5

diff --git a/deltarepo/example/test/repo1/repodata/a5ad5ae1f43eae9e8e1b3fb6ee93e2cf8950708e0b3db8af3ee68f31dd0a38c2-other.xml.gz b/deltarepo/example/test/repo1/repodata/a5ad5ae1f43eae9e8e1b3fb6ee93e2cf8950708e0b3db8af3ee68f31dd0a38c2-other.xml.gz
deleted file mode 100644
index 9a27feec7906ed7275f3995f8b82a2df83eb4ce6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmV;n0ZINJiwFP!000001HF??Z`>ddhVT6qltXUDd>L?JZ`w<4y=~9Y7>_@){#e;;
zyZ!fNo$a<#6{%9IY7T&SnTKIsipTRfkT1Bb{XCUaFir_hey;neE$Qd|Q{w33?p-m5
z4wo7Nkf@*5l6D~+@6&YXr_-6$rvoyqPw9vOE~<3XQ*s1<fEJ@((wODCB*#PB*Co}+
zD{C_;xi_}qjr5|arLY!_G*#}MQNVL26qiyr4bQE0Sfk85LJm1nGQo%?{kZsz25~Iu
z*_mgfBaV>bS{T9OeA$xpQff&R(=4N8!J(vvrkm7vFts?$ErC<$=BV1wBdp}p;Nw|x
zH-v{UZu1Wd)*S@q=kcx$4<sRi#YhAtvG#Z$p_Dd8bI$25Ay56X269W!iu5-BYp`T7
z68S6GW?a95_fbo}#!O)jFbv<w)K4$){$KJHi;<|Ge3R+et5?2aZ&h8SS10`LiJUh^
zV5Uv390;LxURl9~;ZVz58{r_UYQ>F2Z5rnrmqpKT?i@72>B|1_L<0wWu3+u{z!v;!
gi>-}UTZsQ-i^xJ)@y*vsZy#^>9Wk-p=c@w%04{9ZTL1t6

diff --git a/deltarepo/example/test/repo1/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml b/deltarepo/example/test/repo1/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml
deleted file mode 100644
index 068519c..0000000
--- a/deltarepo/example/test/repo1/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-<!-- -->
-</comps>
diff --git a/deltarepo/example/test/repo1/repodata/a81604899900f2f58ead1e4a1d903700efe7acf64f684d6e16c9ae5be16094a7-primary.sqlite.bz2 b/deltarepo/example/test/repo1/repodata/a81604899900f2f58ead1e4a1d903700efe7acf64f684d6e16c9ae5be16094a7-primary.sqlite.bz2
deleted file mode 100644
index c1172b1dba83ce66425daeb9f8132ece8570e406..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2376
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

diff --git a/deltarepo/example/test/repo1/repodata/fac6a651423edc252a488b74995641ec4514e6bca12864032c019dcce9614d81-filelists.xml.gz b/deltarepo/example/test/repo1/repodata/fac6a651423edc252a488b74995641ec4514e6bca12864032c019dcce9614d81-filelists.xml.gz
deleted file mode 100644
index 664319b377cb3901cbaff15c36270d88c3ffc75c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmV-&0ge72iwFP!000001C5f)Zrd;rMfd#*V)hXqqWB0T2LY1ovI*L?F(QYyU|A9*
zIdK2JvZJ^_8x#c>1Tpu{%spWFa6Y!|oyMu@y9#6`fKeCv*mS!JetdtqbMUbFR;H$<
zwwdOME&6V%U_Z~pJ?CxHoz7W29VnxC;zyb>;*9*J2R2|h;EooLf~C{?WW!<C#0oTt
z+S)=X5sXbDsUTBS(poag)IK<qqwr4VLMfe+@YXttq>4c3(G#!^k5s|q81^&*!{x5v
z?9A5aWgKJW8jjJ>UrGutaVy9(ofW`FYAZ0nuhPrb8-AKbUN;>N{c&jNyv6bw=cZuu
z&taJun-M<5(;i3Su@C%Xi@R&@KV1Kk^0(*5r`P9CN6A-6f8+8Z8A*jUK6fak*1on<
zNFy*RuZ?tA)G-%Ekv7SN<cbBS5YAzePS^GmSHc5rYn=A~K}@W~WVW1@nEaC1t?O4w
Qe*cNhFApXy>vjSF0D1AZng9R*

diff --git a/deltarepo/example/test/repo1/repodata/repomd.xml b/deltarepo/example/test/repo1/repodata/repomd.xml
deleted file mode 100644
index 4b75af0..0000000
--- a/deltarepo/example/test/repo1/repodata/repomd.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>1st repo</revision>
-  <tags>
-    <content>A content tag</content>
-  </tags>
-  <data type="primary">
-    <checksum type="sha256">4b4a98a3883ca24ecda5cb105f9c162dfdfc6d074379e7c9e8311f9fde249407</checksum>
-    <open-checksum type="sha256">9276f812675ba0193df682253ece4b14faa8a1dda77a14217aa95a4a53f96caf</open-checksum>
-    <location href="repodata/4b4a98a3883ca24ecda5cb105f9c162dfdfc6d074379e7c9e8311f9fde249407-primary.xml.gz"/>
-    <timestamp>1392910623</timestamp>
-    <size>1060</size>
-    <open-size>3916</open-size>
-  </data>
-  <data type="filelists">
-    <checksum type="sha256">fac6a651423edc252a488b74995641ec4514e6bca12864032c019dcce9614d81</checksum>
-    <open-checksum type="sha256">50c5f1c5645a8e52c16845c321d6b0fcf3bd6ea2227d5d49b1d8f0b585da31ed</open-checksum>
-    <location href="repodata/fac6a651423edc252a488b74995641ec4514e6bca12864032c019dcce9614d81-filelists.xml.gz"/>
-    <timestamp>1392910623</timestamp>
-    <size>370</size>
-    <open-size>630</open-size>
-  </data>
-  <data type="other">
-    <checksum type="sha256">a5ad5ae1f43eae9e8e1b3fb6ee93e2cf8950708e0b3db8af3ee68f31dd0a38c2</checksum>
-    <open-checksum type="sha256">db841078c111c4ae9c59ee996f6234d2dd4bf4f61a01892565bdaf6fb1c0879e</open-checksum>
-    <location href="repodata/a5ad5ae1f43eae9e8e1b3fb6ee93e2cf8950708e0b3db8af3ee68f31dd0a38c2-other.xml.gz"/>
-    <timestamp>1392910623</timestamp>
-    <size>438</size>
-    <open-size>939</open-size>
-  </data>
-  <data type="primary_db">
-    <checksum type="sha256">a81604899900f2f58ead1e4a1d903700efe7acf64f684d6e16c9ae5be16094a7</checksum>
-    <open-checksum type="sha256">84d58ab2442be220c192439c5f528eb11997cd0d5bbd075e634ecb912870d3e8</open-checksum>
-    <location href="repodata/a81604899900f2f58ead1e4a1d903700efe7acf64f684d6e16c9ae5be16094a7-primary.sqlite.bz2"/>
-    <timestamp>1392910623</timestamp>
-    <size>2376</size>
-    <open-size>21504</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="filelists_db">
-    <checksum type="sha256">64e015b633e6cac5193a0a44403162cf90c39bb29cd8cb1df8e5ca0f2ec56436</checksum>
-    <open-checksum type="sha256">4d0dfa0564f4e57953ea58f1d5c28c4bd94b18e2ebf26c640c7c4a3051ec838a</open-checksum>
-    <location href="repodata/64e015b633e6cac5193a0a44403162cf90c39bb29cd8cb1df8e5ca0f2ec56436-filelists.sqlite.bz2"/>
-    <timestamp>1392910623</timestamp>
-    <size>927</size>
-    <open-size>7168</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="other_db">
-    <checksum type="sha256">0e43813b2bf4a47abcafa39072c0bc3279b8ec65ab34b929a6cd234f5b0e3e4f</checksum>
-    <open-checksum type="sha256">54719f2eeae2623c331373f79fe6ed61c9ef81ad861446f566ff31ab7eeff71f</open-checksum>
-    <location href="repodata/0e43813b2bf4a47abcafa39072c0bc3279b8ec65ab34b929a6cd234f5b0e3e4f-other.sqlite.bz2"/>
-    <timestamp>1392910623</timestamp>
-    <size>933</size>
-    <open-size>6144</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="foobar">
-    <checksum type="sha256">06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752</checksum>
-    <open-checksum type="sha256">d2d2acf640179223bf9e1eb43c5fbf854c4e50ffb6733bc3a9279d3ff7de9be1</open-checksum>
-    <location href="repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar-1.gz"/>
-    <timestamp>1392910623</timestamp>
-    <size>29</size>
-    <open-size>9</open-size>
-  </data>
-  <data type="group">
-    <checksum type="sha256">a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5</checksum>
-    <location href="repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-group.xml"/>
-    <timestamp>1392910623</timestamp>
-    <size>140</size>
-  </data>
-  <data type="group_gz">
-    <checksum type="sha256">46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b</checksum>
-    <open-checksum type="sha256">a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5</open-checksum>
-    <location href="repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-group.xml.gz"/>
-    <timestamp>1392910623</timestamp>
-    <size>141</size>
-    <open-size>140</open-size>
-  </data>
-</repomd>
diff --git a/deltarepo/example/test/repo3/comps.xml b/deltarepo/example/test/repo3/comps.xml
deleted file mode 100644
index 068519c..0000000
--- a/deltarepo/example/test/repo3/comps.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-<!-- -->
-</comps>
diff --git a/deltarepo/example/test/repo3/foobar b/deltarepo/example/test/repo3/foobar
deleted file mode 100644
index 76fc659..0000000
--- a/deltarepo/example/test/repo3/foobar
+++ /dev/null
@@ -1 +0,0 @@
-a content
\ No newline at end of file
diff --git a/deltarepo/example/test/repo3/gen.sh b/deltarepo/example/test/repo3/gen.sh
deleted file mode 100755
index 7cf5482..0000000
--- a/deltarepo/example/test/repo3/gen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-MY_DIR=`dirname $0`
-
-if [[ -z "$CREATEREPO" ]]
-then
-    CREATEREPO="createrepo_c"
-fi
-
-if [[ -z "$MODIFYREPO" ]]
-then
-    MODIFYREPO="modifyrepo_c"
-fi
-
-pushd "$MY_DIR"
-$CREATEREPO $EXTRAARGS --pkglist pkglist --groupfile comps.xml --revision "3th repo" --content "Content tag 123456" .
-$MODIFYREPO foobar repodata/
-popd
diff --git a/deltarepo/example/test/repo3/pkglist b/deltarepo/example/test/repo3/pkglist
deleted file mode 100644
index b0436ea..0000000
--- a/deltarepo/example/test/repo3/pkglist
+++ /dev/null
@@ -1,5 +0,0 @@
-../packages/Archer-3.4.5-6.x86_64.rpm
-../packages/balicek-utf8-1.1.1-1.x86_64.rpm
-../packages/empty-0-0.x86_64.rpm
-../packages/fake_bash-1.1.1-1.x86_64.rpm
-../packages/super_kernel-6.0.1-2.x86_64.rpm
diff --git a/deltarepo/example/test/repo3/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar.gz b/deltarepo/example/test/repo3/repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar.gz
deleted file mode 100644
index f2aeb4456eded51c557d87ea88d9234cd98094d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29
gcmb2|=3oE=X73P>bLX`^&uTL=oZvZU&IuF+09#iEi2wiq

diff --git a/deltarepo/example/test/repo3/repodata/07125d910a68f01ac92f37921aa7fb4edd20a05e493c7b9123fd4cd43ed27b45-other.xml.gz b/deltarepo/example/test/repo3/repodata/07125d910a68f01ac92f37921aa7fb4edd20a05e493c7b9123fd4cd43ed27b45-other.xml.gz
deleted file mode 100644
index ffd75b369876a41c8d690210cb9eaaad750c2a98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmV<D0vP=tiwFP!000001GQC6kJ~m7z4uqJEU-7r{1QpU_NE2e+}caG=f#j5+Ky$(
zu;q4h%&|aoPa6bCjy<%w2iRV;{$CwC-c5m^=`OMb0ciw1&EvfHB#j?lENk{7t~c|x
znQ&PM&ajDXnm5x4|KaS>!1ITvpN-pYhU)|!Fv2&R37>V{>cMbW&ztQ<k+usgFl~oR
z>|l=?9`Ky4ATD5vgfBUDIbO2WVmeO~Zcqg0N~J`!E{m+9%t=Y-&?+0M=&c4(d8vg`
zCTCGO=P{uwBSHlga@N2SC;Y2*Jg@<sC;Y<Ob8Co>vGH**hO2geOY!}v6RrzWl$@=x
zo^Z>D2WXr@GsU`{GT3&rmQZKy5;pAHI?}W3r0z!D@=$-d#x#Sji0$%Z+Kt$N$%58E
zaz?Y$ex%mMS|fzurvvtAzTR}~rhPFU-qfE=tO{BK^-p3~3iFQmjIit{>eRIz)b$hA
z%$vvX`F-;1g4RI4=eMOHuio+N;@_qo506RsFcU(7ue8@GOIKy3yaKDdiP=H0<bOyJ
zO(>&ChEjmWn$k!tLvlGH#pgN`0qS|g#bDcIe~V;@V=@j-9+M$ImW-1xF20c?I!Y@?
zq}9F>UynX5D&JkbcnpjFk`aE1O~?4vi{0z1XS-i_fAyFB>;8}a_uZTRZU1!l>gt!>
z^WA0tvVYn?>wn(;+5g6Gt8pbE#}YM2We^k9A(qN%R~b>2A{YhQMJr{B5hEmHD+LCF
zmM+ulD6Tce<*Ivf2XVzwSg{xOWBU`?lBYzgJxFOx6`T~(3P`FlR(c@6wXllp&pu{f
zlJP=#4_SH>-1Yu4Ebu(QX7+ys;Ql@h#D%cI+q!3y(O^lL>;z_CRh8C(1n?HTwWL6{
zWe_M(x)ehukyIdgVoKzxj`~`i&31+B^98OOtnVO@EyRsL>K+6-^t-!2_rj_^V3m8;
Z?=iMb`cGemH$TPGzX2xb`CLZ_005sEdDj2{

diff --git a/deltarepo/example/test/repo3/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-comps.xml.gz b/deltarepo/example/test/repo3/repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-comps.xml.gz
deleted file mode 100644
index 6a703aba38277ee1e296905ea51becb2fcf5bd23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmb2|=3oE==FJ<|pEw(+;jOE6?#%hkp+;AX1A;uxdY|(@dB%HtC>L+x<*fmmwm;q!
zSn{!)ual=B)Z^TFU5zjfj?zybOTq#!UA@ll<s10HL+4`Phcn*SE?+O_EDS7QTMg8H
t`ug?qufah9Oxc&bH9Z5Fq*$Ld^jx_bdf_Uo(U*lv3@RPvjXgkD001Q2KJx$o

diff --git a/deltarepo/example/test/repo3/repodata/5b18db33715f9cbdd50e72b14af24476bad7b065bfe0cf56f45bbebd6dd92b08-primary.sqlite.bz2 b/deltarepo/example/test/repo3/repodata/5b18db33715f9cbdd50e72b14af24476bad7b065bfe0cf56f45bbebd6dd92b08-primary.sqlite.bz2
deleted file mode 100644
index a75baa03b482013bd3171d8bb33b441b03c2e071..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3439
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
RkZxQ4F64@Ep&-;nxq2mGIVAu9

diff --git a/deltarepo/example/test/repo3/repodata/609eca035393772a53575fa2792c238277034760e616e11fbaaf0517e1ea877f-other.sqlite.bz2 b/deltarepo/example/test/repo3/repodata/609eca035393772a53575fa2792c238277034760e616e11fbaaf0517e1ea877f-other.sqlite.bz2
deleted file mode 100644
index 4bd13d79f5a7312c3d0e8ec0c0a28471111d5ddd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1322
zcmV+_1=adOT4*&fL0KkKSz12dV*mnL|NsB;fR6Nk|L_0*{OP~{-}s;>fO>jopm$CH
z0uVuD5R6a+cedJ~2tX<WBAS?!$Rys89%`Pah?zYjBTSlUkkOC>AY{lI4Kq;C)714e
z^#Ep|HcX)tMJK76JyX(RVgLX%4FRTuKmcSkVHie$&<xaM0h2({lOV!kWWY=biK9$L
z011FbnHn$?Oqc}7zyJV738MiBFqoMz69Qsr(-D9IU=gN9j0Dpr0WvTE01<*{z(ACM
zCWb)(l-N+n4FJiq8b%ZKKmcd}27np>41fR%5H#>2Vo#Azw4v$sPQ4Lctfvzcga9GL
z=S1gNg|L7J;Dv<iL5Kz_*mCg<%u_danw);~C~ay=^lZ`1z1vst?V`Dvy_j^fuRc3)
zS56DuTs8qlOrCWqVuy!Tl`Ma@)nP=&L0)y;jmtKiH!7JhU|}mNB?-0S0&?l*-~cMB
zJ>4?UF^xF@T9ffyE0S!MjUvQKu6{)<X4}&SE_9a>X}!jRFRo_4243INf?R9JwQ^Xy
zmrl)faz%;a+qk1j>pQLnXv1X=Qm%nC0EmEV6R_L*X+g4rAeT?j=%1V&4s4pl`5RA}
zu4SyszV7}GZ|TsV!IRak%4^u7R8{z|qxio82=+RHHQx-p87*3H3FuG_P0t}6yl11r
z)|hXmfe^SDJ0d0#?IE%>S@Oi=adfcsrh5bj5u&a;lc^e7a?W_um`Lat0kEA13T(?o
ztZPY^6C_q(ERdtH4VS{gq6Q?fFfbXtiH=J}7F1eXO&&;G$B}TsWyJ{?6^ttg4zlU3
zO0=xFc^piG0z{^=^3x!}_YJ*<1*A!(22?z7;o{OFiiV<$+w>)1MnnsXhLx6#Di~B$
zjWS|fFsQ_dQ2|AR$B!6DXy*e-8ZNYP8if*pF@wqz8W^I-M1<U6Jb_TMjU*8uI9X9q
z0tI5mkRVW5SkXmpDM?L?d&?$PFr$hT3q=qhP=I_WbY5}p031SfW>2qB3{q13yN7}b
z(LQ{<r|)RtPnmOf7iWGYNW?pAj~ca$kOf1=B|z8ehuZd$O~DW_3Y6T14)!V<iB>RV
zKym==Dv=<#HL>8>ebP}%2G9ncLyQI>SL)7moj_$(*OkDw=zxXR1VAVN+X0U|Lq_;K
z-LN+alldYJ5xSpe4>`ybY6XfGGmpv|MBg&@rnFy45~G$tupE8JlaC<;<q6Y@Er4$6
z)vU@up?^D^XBCuiw`VL#36RQXB#!L5gIbhCd2z5@7KH}fS$Sw)@*@hyloVWZ#7$>!
zEW#_KF4RVJ&`#kIte<RoYI_3Z4vCc1UcuOq9x%mLUa5Jx&Zvmn1s56xpkJeNGPIZl
zMg|6>Afat27aY>hgm7p}1(Rmy7ZyKc$a#p2F*g{JL=<&#WvWEVZ=u$hTeM^zXg18n
z#{kr_q2_?fM3P8wvr0%&ok^VFCf3*(pecwZSs~M4kVrVu$ywPGX2G9&W5bGan*Kga
z8#qJ;pv(sJnNkcW<)R!X^j?Bv9LS7-q|${*B-Y*uX~a?>yHN+R48TzwTlU_3T|*SB
z>M$iKTpN87SOvq(bVw*f=m}IUt4e3jg}DU)9xbnf?0#m^GHX8booJ$So1!M67uq>w
zFKC5al&!36<`9aGG?s%H5kewm0N_Q?fn01!VGLq16LG5baBch4hYRKDvwdpJF*E$O
gBgcu6V%3{dMA%QMrD!3R0Z;h5k}1N3g3<Q-81}JCe*gdg

diff --git a/deltarepo/example/test/repo3/repodata/7946a0f6e1676a33f763e12eddf0ce805c15a81d5de9d93ca81537eda34ccef4-filelists.sqlite.bz2 b/deltarepo/example/test/repo3/repodata/7946a0f6e1676a33f763e12eddf0ce805c15a81d5de9d93ca81537eda34ccef4-filelists.sqlite.bz2
deleted file mode 100644
index 885dde066207858b7965bb5822e58ebbd8927c3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1217
zcmV;y1U~yhT4*&fL0KkKS(wof#sC6LfB*mXu<FC_|LXtm{Ncav-*~VAgajCaKrjM`
z0wF<UIE+vPT<u4ICooiyXo;a2OeUIQGI|IA0001J000004GjUNO%PxJ0000000000
z00000000U`q|HxLZ&H~7kjbVIqd<BQ<qtqZ1R69k4^R(Li1iOi>KQN+NJ5yx6!xg{
znmtWD6V$}@01XU)14BRn02&6G1Jnno5{L<e4J4nU6m38O>NEkNp`d7bfB*mu01W}7
zLJ~g^w3rP)V~y6Hr{3)~n$s~X?_ngTY3ffr(@iD@L4}D*9V!_Jp|T=&v1^BL_>n4{
z+iN9f=357?S})jv``I}79CVmbPwY!YP})R;(KsS2iY(aL!$A)<dm+JAI_rIjdnPgY
zt}KHSr(Pu3p+1N5^h~5RCC3tIl4+N7V=g_$5DuL+0pLO?simm_4=nHj0&Pb;-jFni
zn)t#LF0z0df<zpQAtsq*F(z0z9_<#?I(ZPb*1txwR((CxLdiHmIg%Ml;Y^Yh2)0sD
zq8s+t8NseJ4!1csK-~$EoM<sP+3!0*78TPNj;hvBUrADpXLN{b(GP}-!If>Pb4rq7
zxHYgT)FGG^LS$I4X_gS&c##bsgxgmI&|iIRzfLkjVj_u>cihfq$2eB}{ThriAKozJ
zOB?6vN2B!~xnZSE57=?zlQK5ZTq#mD7&Lk=1xXVz7+fh@k{n`35(VRNprgu^COm;M
z14a=rp;H2bN)=M$iw~_aDny}N#TXJVlMIW@#*ZEDBuf+=RJ^!=;lu_L6p-OfHNe<S
zOXx(%$f;8X#zP5@F(^UgaeD@mG%h4;6uf}~u}2afJS^h!d)Ao~ojM9!W-x(cA;EaT
z^|*1c!URbS9BBELQrDEBA)`wVCKn7GM2R7VM+!MDWn2r(h7d0(5)^>~glrgoAHZGd
zwk1Xo<6lRVRm!qK79goxyq&p$Ci+cc_cEM=3DpXCFRjV>(Ter$7=#4UwIC2vC5F?O
z2de=@u?ex*ea|7;iKq1Ngo4!uWKg3$)_&D%vw@UMs?<fyF$-;?m8>{zU*w{)sRYa$
zB^(lf6E<}J+=Tt&;+s=~F`1jc2n;~scq2)i(&Nldq9o4!Aav>;Dbz&2kq$%r6GnBT
z^cIEZJhwb!28`Z3B+g=HSmhotlt}t15>PQSFvvEBLrG>`KzR{`49rC`IeY2BWJ>Ev
z_KDDFW~5CG;f7{ohmP3InPKO=;Vw6anWm;KB_-wV4LgYJ;o@Dwa2ke2rsUx_3OMBk
zr%o6gUx^T?r&*s7xOrTGjxdWO5-Y`Hdn+QCGnu0)S;&yPek@ld$t{x{b>^mrTq&rp
zHjz_laU*Wqw_Hepz?BsXj)8VwR#MAnxy0$R&3X-l>0;5UDnYMY60#7RruQa}kl2Xh
zNR+Y_^Ky_yYXym!nIW1eBx+zR%7_@!Cb7una44YVv5+nGb9*Atf^MDW`;I#?8LZ-y
z1XH_AM2=O@Ac%=!BL?CK@eTeHj`1#2{`fshoKssF>R?(F81bZ7(%IhVbI|7@xDEcE
f11#`i&~Tjh2U&*?bQw4SzvAvlrwS4i8X_3L2_p*R

diff --git a/deltarepo/example/test/repo3/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml b/deltarepo/example/test/repo3/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml
deleted file mode 100644
index 068519c..0000000
--- a/deltarepo/example/test/repo3/repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-<!-- -->
-</comps>
diff --git a/deltarepo/example/test/repo3/repodata/e6c1900810fb1155e7a29c59df839e9d20a369b5fb2cad87d880f664fa815e3f-filelists.xml.gz b/deltarepo/example/test/repo3/repodata/e6c1900810fb1155e7a29c59df839e9d20a369b5fb2cad87d880f664fa815e3f-filelists.xml.gz
deleted file mode 100644
index d9d311b4c2909a8366a7e0e96b19b8505d7f6be4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmV-00?+*)iwFP!000001ErM9Zrd;rMfd#*f%{0qhxjP01Ob}vx+&VVF(ik!U|AL<
zxp4aRr4!q2njlS3Xh8|QGjs0|rNzx*+Z8`(oZ4OAFkS*Hs1Li?_N#_{|MvOHvYYD<
zi_~`1wbMKmS>I0$ThH_Gv8uYZ-yh1j-%v?$Uu|i|h%;6fJu3zb8(dMYsafuHdMt*`
zs*Md(1m2ih2ngCFNFwkQ1viGY(B1{BC4#eDf)FYtaK>1QB<euu&=D(o+)~4C$FQc6
z6`0qC9jsnzmB$su;uNl+VRzgT>=?IUvQ%Zwijlg8X;wW*kFKw){WMm-?W?fc4jmnq
zxOj+jQ55t2kSE4=WRK!$jU!cY7pg}WR}a1as(MXYeZ9N=^yThcv8Yavp5p?6)=4X4
z;>IN*tUxWS3dx|?8I6yDl&=Fsl>w2`s#ct8A599B$)0g}?Akz^tNonp8=%1n8ZYy8
zg2s=~Ua{&prcjeaE)-GB_de9ZNaGZ^8oUxHP0*aj5GY_&+6h$TB{wO*a5!6~?J(cJ
z!y}yh!N2@L(iu%2D=l)al=FrI*MLztrMbn7O@bDgVzMFGI`adt78AG1o3p=!8(Mmt
z*8jut+2Ol%eZ!&9QAyM}MKVCiI_ISH*{s!Qwa#vnu00SCH!=8>0|}p_gcvh_8RR+1
yv>#|(ZfNYOdq)^u!X=D&G0dNhU->My_*7cja`p42{J(!M*S`Q_udC0&1ONasq7{e$

diff --git a/deltarepo/example/test/repo3/repodata/f209787b500f81fc59f7babcfaa122db99cbe3c0817edd7336febc96b95ece33-primary.xml.gz b/deltarepo/example/test/repo3/repodata/f209787b500f81fc59f7babcfaa122db99cbe3c0817edd7336febc96b95ece33-primary.xml.gz
deleted file mode 100644
index e00345af93fdcea50d88f09155a118582415ff36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1740
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

diff --git a/deltarepo/example/test/repo3/repodata/repomd.xml b/deltarepo/example/test/repo3/repodata/repomd.xml
deleted file mode 100644
index aa4d77c..0000000
--- a/deltarepo/example/test/repo3/repodata/repomd.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>3th repo</revision>
-  <tags>
-    <content>Content tag 123456</content>
-  </tags>
-  <data type="primary">
-    <checksum type="sha256">f209787b500f81fc59f7babcfaa122db99cbe3c0817edd7336febc96b95ece33</checksum>
-    <open-checksum type="sha256">a09ebfe06c2ab1200ef8f05bb380f9540f1d06e6a1407f16c7f325eb20a86109</open-checksum>
-    <location href="repodata/f209787b500f81fc59f7babcfaa122db99cbe3c0817edd7336febc96b95ece33-primary.xml.gz"/>
-    <timestamp>1392910626</timestamp>
-    <size>1740</size>
-    <open-size>8069</open-size>
-  </data>
-  <data type="filelists">
-    <checksum type="sha256">e6c1900810fb1155e7a29c59df839e9d20a369b5fb2cad87d880f664fa815e3f</checksum>
-    <open-checksum type="sha256">fb32b1e587f0a2499ea15fb2224d0dec9ce615f2661ba4757b3ea18ce56ccc76</open-checksum>
-    <location href="repodata/e6c1900810fb1155e7a29c59df839e9d20a369b5fb2cad87d880f664fa815e3f-filelists.xml.gz"/>
-    <timestamp>1392910626</timestamp>
-    <size>560</size>
-    <open-size>1217</open-size>
-  </data>
-  <data type="other">
-    <checksum type="sha256">07125d910a68f01ac92f37921aa7fb4edd20a05e493c7b9123fd4cd43ed27b45</checksum>
-    <open-checksum type="sha256">cb344434c4f54eca225b3db0202163bd61f7524e3f18df4812f82c9377b0350e</open-checksum>
-    <location href="repodata/07125d910a68f01ac92f37921aa7fb4edd20a05e493c7b9123fd4cd43ed27b45-other.xml.gz"/>
-    <timestamp>1392910626</timestamp>
-    <size>743</size>
-    <open-size>1863</open-size>
-  </data>
-  <data type="primary_db">
-    <checksum type="sha256">5b18db33715f9cbdd50e72b14af24476bad7b065bfe0cf56f45bbebd6dd92b08</checksum>
-    <open-checksum type="sha256">711c7cd2ab9c93a5a7349c8a1b225a6794fc87fa66232329f33273ce7e117a0c</open-checksum>
-    <location href="repodata/5b18db33715f9cbdd50e72b14af24476bad7b065bfe0cf56f45bbebd6dd92b08-primary.sqlite.bz2"/>
-    <timestamp>1392910626</timestamp>
-    <size>3439</size>
-    <open-size>23552</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="filelists_db">
-    <checksum type="sha256">7946a0f6e1676a33f763e12eddf0ce805c15a81d5de9d93ca81537eda34ccef4</checksum>
-    <open-checksum type="sha256">ba39a46626a7b413d775ce685d52a81e536d748fa56af0558ecc8d109f48b55c</open-checksum>
-    <location href="repodata/7946a0f6e1676a33f763e12eddf0ce805c15a81d5de9d93ca81537eda34ccef4-filelists.sqlite.bz2"/>
-    <timestamp>1392910626</timestamp>
-    <size>1217</size>
-    <open-size>7168</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="other_db">
-    <checksum type="sha256">609eca035393772a53575fa2792c238277034760e616e11fbaaf0517e1ea877f</checksum>
-    <open-checksum type="sha256">d30994831b79ac3cb8a819c4f17cac0b9ae95f093539ffc216845f9f9216cd42</open-checksum>
-    <location href="repodata/609eca035393772a53575fa2792c238277034760e616e11fbaaf0517e1ea877f-other.sqlite.bz2"/>
-    <timestamp>1392910626</timestamp>
-    <size>1322</size>
-    <open-size>6144</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="foobar">
-    <checksum type="sha256">06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752</checksum>
-    <open-checksum type="sha256">d2d2acf640179223bf9e1eb43c5fbf854c4e50ffb6733bc3a9279d3ff7de9be1</open-checksum>
-    <location href="repodata/06d8204d74de57ed4050a72280d25d2e73dabf8298f94e415d12d3b847682752-foobar.gz"/>
-    <timestamp>1392910626</timestamp>
-    <size>29</size>
-    <open-size>9</open-size>
-  </data>
-  <data type="group">
-    <checksum type="sha256">a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5</checksum>
-    <location href="repodata/a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5-comps.xml"/>
-    <timestamp>1392910626</timestamp>
-    <size>140</size>
-  </data>
-  <data type="group_gz">
-    <checksum type="sha256">46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b</checksum>
-    <open-checksum type="sha256">a5e176f8963047438fee997c4cad6a5388ef85d0b22d72a48712cc91bf2821c5</open-checksum>
-    <location href="repodata/46b296e6f4193dcf5cdc11f10be8472a7085c6d45f05a09da5ef4e4c80c8828b-comps.xml.gz"/>
-    <timestamp>1392910626</timestamp>
-    <size>141</size>
-    <open-size>140</open-size>
-  </data>
-</repomd>
diff --git a/deltarepo/repocontenthash.py b/deltarepo/repocontenthash.py
index 480741d..e3a76e5 100755
--- a/deltarepo/repocontenthash.py
+++ b/deltarepo/repocontenthash.py
@@ -77,7 +77,7 @@ def setup_logging(quiet, verbose):
 
 def print_contenthashes(args, logger):
     # Print content hash from the repomd.xml
-    localrepo = LocalRepo.from_path(args.path, calculate_contenthash=False)
+    localrepo = LocalRepo.from_path(args.path, calc_contenthash=False)
     if localrepo.repomd_contenthash and localrepo.repomd_contenthash_type:
         print("R {0} {1}".format(localrepo.repomd_contenthash_type, localrepo.repomd_contenthash))
 
@@ -90,7 +90,7 @@ def print_contenthashes(args, logger):
 
 def check(args, logger):
     # Get type and value of content hash in repomd
-    localrepo = LocalRepo.from_path(args.path, calculate_contenthash=False)
+    localrepo = LocalRepo.from_path(args.path, calc_contenthash=False)
     if not localrepo.repomd_contenthash or not localrepo.repomd_contenthash_type:
         if args.missing_contenthash_in_repomd_is_ok:
             return True
diff --git a/deltarepo/repoupdater.py b/deltarepo/repoupdater.py
index 7eef5f1..6bdccde 100755
--- a/deltarepo/repoupdater.py
+++ b/deltarepo/repoupdater.py
@@ -122,7 +122,6 @@ def update_with_deltas(args, drmirros, localrepo, originrepo, logger):
 
     # Resolve path
     resolved_path = updatesolver.resolve_path(source_contenthash, target_contenthash)
-    print(resolved_path)
 
     # TODO check cost, if bigger then cost of downloading
     #      origin repo then download origin repo
-- 
2.7.4