Re: [PATCH 5/6] classes/dpkg: Properly update packages in the cache

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 29 Aug 2017 10:20:41 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:

> > This is another fixup of 1/6, fold it in.
> >   
> 
> It's a good question if we want to keep development history. Because 
> these patches reflect the real history of binary caching development.

To me the answer is clear. If we find issues in a patch during review,
the patch should be fixed before getting merged.
If we do not follow that policy you might as well merge all patches
without review.

Henning

> > 
> > Am Sun, 27 Aug 2017 18:13:38 +0300
> > schrieb Alexander Smirnov <asmirnov@ilbers.de>:
> >   
> >> From: Frank Lenormand <lenormf@gmail.com>
> >>
> >> Before installing to cache, existing packages with the same name
> >> and version have to be removed.
> >>
> >> Signed-off-by: Frank Lenormand <lenormf@gmail.com>
> >> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> >> ---
> >>   meta/classes/dpkg.bbclass | 46
> >> +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43
> >> insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> >> index 118ba2f..72ae79f 100644
> >> --- a/meta/classes/dpkg.bbclass
> >> +++ b/meta/classes/dpkg.bbclass
> >> @@ -84,12 +84,52 @@ do_install_to_cache() {  
> >>               > "${DIR_CACHE}/conf/distributions"  
> >>       fi
> >>   
> >> +    print_field_value() {
> >> +        awk "\$1 == \"${1}:\" { print \$2; }"
> >> +    }
> >> +
> >> +    call_reprepro() {
> >> +        reprepro --waitforlock 3 -b "${DIR_CACHE}" --dbdir
> >> "${DIR_DB}" \
> >> +            -C main "$@"
> >> +    }
> >> +
> >>       # Add binary and source packages to the deb cache
> >>       # If the cache doesn't exist yet, it will be created using
> >> the # `distributions` file generated above.
> >> -    ls -1 "${BUILDROOT}"/*.deb "${BUILDROOT}"/*.dsc | while read
> >> -r p; do
> >> -        reprepro --waitforlock 3 -b "${DIR_CACHE}" --dbdir
> >> "${DIR_DB}" \
> >> -            -C main "include${p##*.}" "${DEBDISTRONAME}" "${p}"
> >> +    ls -1 "${BUILDROOT}"/*.deb | while read -r p; do
> >> +        name_package=$(dpkg -f "${p}" | print_field_value
> >> "Package")
> >> +        version_package=$(dpkg -f "${p}" | print_field_value
> >> "Version") +
> >> +        # Remove all packages with the same version that were
> >> added to the
> >> +        # repository in previous builds
> >> +        call_reprepro \
> >> +            -A "${DISTRO_ARCH}" \
> >> +            removefilter "${DEBDISTRONAME}" \
> >> +            "Package (== ${name_package}), \
> >> +            Version (== ${version_package})"
> >> +        call_reprepro \
> >> +            -A "${DISTRO_ARCH}" \
> >> +            "include${p##*.}" \
> >> +            "${DEBDISTRONAME}" \
> >> +            "${p}"
> >> +    done
> >> +
> >> +    ls -1 "${BUILDROOT}"/*.dsc | while read -r p; do
> >> +        name_package=$(cat "${p}" | print_field_value "Source")
> >> +        version_package=$(cat "${p}" | print_field_value
> >> "Version") +
> >> +        # Remove all source packages with the same version that
> >> were added to
> >> +        # the repository in previous builds
> >> +        call_reprepro \
> >> +            -A "source" \
> >> +            removefilter "${DEBDISTRONAME}" \
> >> +            "Package (== ${name_package}), \
> >> +            Version (== ${version_package})"
> >> +        call_reprepro \
> >> +            -A "source" \
> >> +            "include${p##*.}" \
> >> +            "${DEBDISTRONAME}" \
> >> +            "${p}"
> >>       done
> >>   }
> >>     
> >