gmane.linux.rpm.metadata

createrepo.spec

2013-04-17T14:06:11

 createrepo.spec |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 590075b62116e03fd3a7f3cc63ec2d70a0512340
Author: Zdenek Pavlas <zpavlas< at >redhat.com>
Date:   Wed Apr 17 16:05:15 2013 +0200

    don't BuildRequire bash-completion in rhel

diff --git a/createrepo.spec b/createrepo.spec
index cdd8b6f..9a2179b 100644
--- a/createrepo.spec
+++ b/createrepo.spec
< at >< at > -1,4 +1,10 < at >< at >
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%if ! 0%{?rhel}
+# we don't have this in rhel yet...
+BuildRequires: bash-completion
+%endif
+
 # disable broken /usr/lib/rpm/brp-python-bytecompile
 %define __os_install_post %{nil}
 %define compdir %(pkg-config --variable=completionsdir bash-completion)
< at >< at > -16,7 +22,6 < at >< at > Source: %{name}-%{version}.tar.gz
 URL: http://createrepo.baseurl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildArchitectures: noarch
-BuildRequires: bash-completion
 Requires: python >= 2.1,

modifyrepo.py

James Antill — 2013-04-16T20:15:35

 modifyrepo.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d10d518d16d97fdce00676d57461e089982d613d
Author: James Antill <james< at >and.org>
Date:   Tue Apr 16 16:15:19 2013 -0400

    Fail for bad compress-type options to modifyrepo, like createrepo. BZ 886589.

diff --git a/modifyrepo.py b/modifyrepo.py
index e7c34c0..bffe99a 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -208,8 +208,10 < at >< at > def main(args):
     repomd.checksum_type = opts.sumtype
     repomd.unique_md_filenames = opts.unique_md_filenames
     repomd.compress = opts.compress
-    if opts.compress_type in _available_compression:
-        repomd.compress_type = opts.compress_type
+    if opts.compress_type not in _available_compression:
+        print "Compression %s not available: Please choose from: %s" % (opts.compress_type, ', '.join(_available_compression))
+        return 1
+    repomd.compress_type = opts.compress_type
 
     # remove
     if opts.remove:

docs/createrepo.8 genpkgmetadata.py

James Antill — 2013-04-16T19:56:04

 docs/createrepo.8 |   13 ++++++++++++-
 genpkgmetadata.py |    4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f280fa5848e1b6b77fb16a2b694e0b4167c20fe6
Author: James Antill <james< at >and.org>
Date:   Tue Apr 16 15:55:59 2013 -0400

    Fix options documentation. BZ 892657.

diff --git a/docs/createrepo.8 b/docs/createrepo.8
index ff359de..eefd4bf 100644
--- a/docs/createrepo.8
+++ b/docs/createrepo.8
< at >< at > -37,6 +37,10 < at >< at > cache of checksums of packages in the repository. In consecutive runs of
 createrepo over the same repository of files that do not have a complete
 change out of all packages this decreases the processing time dramatically.
 .br
+.IP "\fB\--basedir\fP"
+Basedir for path to directories in the repodata, default is the current working
+directory.
+.br
 .IP "\fB\--update\fP"
 If metadata already exists in the outputdir and an rpm is unchanged
 (based on file size and mtime) since the metadata was generated, reuse
< at >< at > -49,6 +53,9 < at >< at > skip the stat() call on a --update, as

createrepo.bash

Ville Skyttä — 2013-04-13T17:46:27

 createrepo.bash |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 644181167efd7bbf5a6daafd9f4b918d1f20fa01
Author: Ville SkyttÃ¤ <ville.skytta< at >iki.fi>
Date:   Sat Apr 13 20:46:19 2013 +0300

    modifyrepo: Add --no-compress to completion.

diff --git a/createrepo.bash b/createrepo.bash
index 4b2cc36..14b43d8 100644
--- a/createrepo.bash
+++ b/createrepo.bash
< at >< at > -119,8 +119,8 < at >< at > _cr_modifyrepo()
 
     if [[ $2 == -* ]] ; then
         COMPREPLY=( $( compgen -W '--version --help --mdtype --remove
-            --compress --compress-type --checksum --unique-md-filenames
-            --simple-md-filenames' -- "$2" ) )
+            --compress --no-compress --compress-type --checksum
+            --unique-md-filenames --simple-md-filenames' -- "$2" ) )
         return 0
     fi
 
_______________________________________________
Rpm-metadata mailing list
Rpm-metadata< at >lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/rpm-metadata

modifyrepo.py

2013-04-11T08:52:31

 modifyrepo.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 0f65ec014b9c56a751c2729c3c559a52e24b1dea
Author: Zdenek Pavlas <zpavlas< at >redhat.com>
Date:   Thu Apr 11 10:35:45 2013 +0200

    modifyrepo: fix --compress option bug. BZ 950724
    
    We were compressing files added to the repository even when
    the --compress option was not specified.  It's even documented
    in modifyrepo man page examples.
    
    Fix the bug that caused this, and change the default to True
    to minimize possible breakage.  Also add --no-compress option
    to turn it off.

diff --git a/modifyrepo.py b/modifyrepo.py
index b6129b7..e7c34c0 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -44,7 +44,6 < at >< at > class RepoMetadata:
         """ Parses the repomd.xml file existing in the given repo directory. """
         self.repodir = os.path.abspath(repo)
         self.repomdxml = os.path.join(self.repodir, 'repomd.xml')
-        self.compress = False
         self.compress_type = _availa

[PATCH] modifyrepo: fix --compress option bug. BZ950724

Zdenek Pavlas — 2013-04-11T08:45:59

We were compressing files added to the repository even when
the --compress option was not specified.  It's even documented
in modifyrepo man page examples.

Fix the bug that caused this, and change the default to True
to minimize possible breakage.  Also add --no-compress option
to turn it off.
---
 modifyrepo.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modifyrepo.py b/modifyrepo.py
index b6129b7..22e0e21 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -44,7 +44,6 < at >< at > class RepoMetadata:
         """ Parses the repomd.xml file existing in the given repo directory. """
         self.repodir = os.path.abspath(repo)
         self.repomdxml = os.path.join(self.repodir, 'repomd.xml')
-        self.compress = False
         self.compress_type = _available_compression[-1] # best available
 
         if not os.path.exists(self.repomdxml):
< at >< at > -113,7 +112,7 < at >< at > class RepoMetadata:
 
         do_compress = False
         ## Compress the metadata and move it into the repodata
-

3 commits - createrepo.spec genpkgmetadata.pyMakefile modifyrepo.py

2013-04-05T13:27:43

 Makefile          |    8 ++++++--
 createrepo.spec   |    9 ++++++++-
 genpkgmetadata.py |   11 ++++-------
 modifyrepo.py     |   16 ++++++++++++++--
 4 files changed, 32 insertions(+), 12 deletions(-)

New commits:
commit df2aa15487a497d69b00578be671f885efc8ffa2
Author: Zdenek Pavlas <zpavlas< at >redhat.com>
Date:   Fri Apr 5 15:26:16 2013 +0200

    modifyrepo: add --checksum and --{unique,simple}-md-filenames options

diff --git a/modifyrepo.py b/modifyrepo.py
index acdde77..b6129b7 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -44,7 +44,6 < at >< at > class RepoMetadata:
         """ Parses the repomd.xml file existing in the given repo directory. """
         self.repodir = os.path.abspath(repo)
         self.repomdxml = os.path.join(self.repodir, 'repomd.xml')
-        self.checksum_type = 'sha256'
         self.compress = False
         self.compress_type = _available_compression[-1] # best available
 
< at >< at > -130,7 +129,10 < at >< at > class RepoMetadata:
         print "Wrote:", destmd
 
         open_csum = checksum(sel

[PATCH 1/2] Get rid of uselessopts.simple_md_filenames option, update help.

Zdenek Pavlas — 2013-04-05T13:27:50

---
 genpkgmetadata.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index c46e441..09bcba4 100755
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
< at >< at > -101,11 +101,11 < at >< at > def parse_args(args, conf):
     parser.add_option("--changelog-limit", dest="changelog_limit",
         default=None, help="only import the last N changelog entries")
     parser.add_option("--unique-md-filenames", dest="unique_md_filenames",
-        help="include the file's checksum in the filename, helps with proxies",
+        help="include the file's checksum in the filename, helps with proxies (default)",
         default=True, action="store_true")
-    parser.add_option("--simple-md-filenames", dest="simple_md_filenames",
-        help="do not include the file's checksum in the filename, helps with proxies",
-        default=False, action="store_true")
+    parser.add_option("--simple-md-filenames", dest="unique_md_filenames",
+        help="do not include the fil

[PATCH 2/2] modifyrepo: add --checksum and --{unique,simple}-md-filenames options

Zdenek Pavlas — 2013-04-05T13:27:51

---
 modifyrepo.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modifyrepo.py b/modifyrepo.py
index acdde77..b6129b7 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -44,7 +44,6 < at >< at > class RepoMetadata:
         """ Parses the repomd.xml file existing in the given repo directory. """
         self.repodir = os.path.abspath(repo)
         self.repomdxml = os.path.join(self.repodir, 'repomd.xml')
-        self.checksum_type = 'sha256'
         self.compress = False
         self.compress_type = _available_compression[-1] # best available
 
< at >< at > -130,7 +129,10 < at >< at > class RepoMetadata:
         print "Wrote:", destmd
 
         open_csum = checksum(self.checksum_type, metadata)
-        csum, destmd = checksum_and_rename(destmd, self.checksum_type)
+        if self.unique_md_filenames:
+            csum, destmd = checksum_and_rename(destmd, self.checksum_type)
+        else:
+            csum = checksum(self.checksum_type, destmd)
         base_destmd = os.path.basename(destmd

2 commits - createrepo.bash

Ville Skyttä — 2013-04-05T15:26:56

 createrepo.bash |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 9b75c361142758989f069ae230583ad63755c34c
Author: Ville SkyttÃ¤ <ville.skytta< at >iki.fi>
Date:   Fri Apr 5 18:25:39 2013 +0300

    modifyrepo: Add --checksum and --{unique,simple}-md-filenames to completions.

diff --git a/createrepo.bash b/createrepo.bash
index 8cef728..4b2cc36 100644
--- a/createrepo.bash
+++ b/createrepo.bash
< at >< at > -6,6 +6,11 < at >< at > _cr_compress_type()
         | sed -ne 's/,/ /g' -ne 's/.*[Cc]ompression.*://p' )" -- "$2" ) )
 }
 
+_cr_checksum_type()
+{
+    COMPREPLY=( $( compgen -W 'md5 sha1 sha256 sha512' -- "$1" ) )
+}
+
 _cr_createrepo()
 {
     COMPREPLY=()
< at >< at > -25,7 +30,7 < at >< at > _cr_createrepo()
             return 0
             ;;
         -s|--checksum)
-            COMPREPLY=( $( compgen -W 'md5 sha1 sha256 sha512' -- "$2" ) )
+            _cr_checksum_type "$2"
             return 0
             ;;
         -i|--pkglist|--read-pkgs-list)
< at >< at > -106,11 +111,16 < at >< at > _cr_modifyrepo()

Re: [PATCH] move bash-completion scripts to /usr/share/ BZ 923001

Ville Skyttä — 2013-03-27T19:06:33

Because they don't have a dependency on bash-completion.

http://fedoraproject.org/wiki/Packaging:Guidelines#File_and_Directory_Ownership

Re: [PATCH] move bash-completion scripts to /usr/share/ BZ 923001

Zdenek Pavlas — 2013-03-27T12:09:13

/usr/share/bash-completion is owned by package bash-completion.
Why should yum or createrepo own it, too?

Re: [PATCH] move bash-completion scripts to /usr/share/ BZ 923001

Ville Skyttä — 2013-03-25T20:40:43

%{compdir} usually expands to /usr/share/bash-completion/completions so
the above would leave the parent /usr/share/bash-completion dir unowned.
In that scenario using %(dirname %{compdir}) would be a fix.

[PATCH] move bash-completion scripts to /usr/share/BZ 923001

Zdenek Pavlas — 2013-03-20T11:06:08

---
 Makefile        | 7 +++++--
 createrepo.spec | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 60bb9db..356bb50 100644
--- a/Makefile
+++ b/Makefile
< at >< at > -1,4 +1,5 < at >< at >
 PKGNAME = createrepo
+ALIASES = mergerepo modifyrepo genpkgmetadata.py mergerepo.py modifyrepo.py
 VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
 RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)
 CVSTAG=createrepo-$(subst .,_,$(VERSION)-$(RELEASE))
< at >< at > -26,6 +27,7 < at >< at > docdir =
 includedir = ${prefix}/include
 oldincludedir = /usr/include
 mandir = ${prefix}/share/man
+compdir = $(shell pkg-config --variable=completionsdir bash-completion)
 
 pkgdatadir = $(datadir)/$(PKGNAME)
 pkglibdir = $(libdir)/$(PKGNAME)
< at >< at > -33,7 +35,7 < at >< at > pkgincludedir = $(includedir)/$(PKGNAME)
 top_builddir = 
 
 # all dirs
-DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)/bash_completion.d \
+DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(compdir) \
 $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandi

Changes to 'refs/tags/createrepo-0-9-9'

2013-03-06T11:11:25

Tag 'createrepo-0-9-9' created by Zdenek Pavlas <zpavlas< at >redhat.com> at 2013-03-06 11:11 +0000

createrepo-0-9-9

Changes since createrepo-0-9-8-54:
---
 0 files changed
---

modifyrepo.py

2013-03-06T10:45:08

 modifyrepo.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7ea9fd45edc74ae89fee9c026584372c7091e53
Author: Zdenek Pavlas <zpavlas< at >redhat.com>
Date:   Wed Mar 6 11:44:15 2013 +0100

    modifyrepo: use integer timestamps

diff --git a/modifyrepo.py b/modifyrepo.py
index bf1eec0..acdde77 100755
--- a/modifyrepo.py
+++ b/modifyrepo.py
< at >< at > -142,7 +142,7 < at >< at > class RepoMetadata:
         new_rd.checksum = (self.checksum_type, csum)
         new_rd.openchecksum = (self.checksum_type, open_csum)
         new_rd.size = str(os.stat(destmd).st_size)
-        new_rd.timestamp = str(os.stat(destmd).st_mtime)
+        new_rd.timestamp = str(int(os.stat(destmd).st_mtime))
         self.repoobj.repoData[new_rd.type] = new_rd
         self._print_repodata(new_rd)
         self._write_repomd()

Re: URL-encoded hrefs

Ash Charles — 2013-03-06T01:14:00

Thanks for the replies.

I'm using version 0.4.9.  Or rather,
$ createrepo -V
0.4.9
$ dpkg -s createrepo
...
Version: 0.4.11-1.1
...

Should I be using the latest dev. version?

--Ash

On Mon, Mar 4, 2013 at 10:11 AM, Ash Charles <ashcharles< at >gmail.com> wrote:

Re: URL-encoded hrefs

Ville Skyttä — 2013-03-05T19:39:04

But that's XML encoding, while the OP is asking about URL encoding.
Which IMO should Just Happen properly if it already doesn't (haven't
checked) without any configuration options - if there's a + in a
filename, it needs to be encoded as %2B in a URL.

Re: URL-encoded hrefs

James Antill — 2013-03-04T22:09:18

 What version are you using?
 The current upstream createrepo uses yum which does call to_xml(blah,
attrib=True) in all code paths, that I can see.

URL-encoded hrefs

Ash Charles — 2013-03-04T18:11:29

Hi,

I have an RPM repository that includes packages with characters in the
file name that shouldn't be used in a URL e.g. the '+' in
libjpeg8-8d+1.2.1-r2.armv7a_vfp_neon.rpm.  I'm hosting the repository
on web space (specifically Amazon S3) that urlencodes any forbidden
characters so the URL I (and zypper) expect

http://package-cache.gumstix.org/armv7a_vfp_neon/libjpeg8-8d+1.2.1-r2.armv7a_vfp_neon.rpm

doesn't work because of the '+' sign.  The actual URL turns out to be

http://package-cache.gumstix.org/armv7a_vfp_neon/libjpeg8-8d%2B1.2.1-r2.armv7a_vfp_neon.rpm

Is there a flag or setting for createrepo that allows it to generate
urlencoded hrefs?  If not, would the project be open to a patch that
made this option available?

Thanks,
Ash

Re: worker.py

James Antill — 2013-03-04T21:54:21


 ACK.

_______________________________________________
Rpm-metadata mailing list
Rpm-metadata< at >lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/rpm-metadata