James Antill | 6 Jan 21:27 2010

createrepo/__init__.py

 createrepo/__init__.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 044f521cadd42df029cfd75070defe699fe7f432
Author: Dennis Gregorovic <dgregor <at> redhat.com>
Date:   Wed Jan 6 15:26:58 2010 -0500

    Change baseurl of "old" packages on update, when baseurl specified

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 77a03ee..0ffe6cb 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
 <at>  <at>  -543,6 +543,17  <at>  <at>  class MetaDataGenerator:
                                       (othernode, self.otherfile)):
                     if node is None:
                         break
+
+                    if self.conf.baseurl:
+                        anode = node.children
+                        while anode is not None:
+                            if anode.type != "element":
+                                anode = anode.next
+                                continue
+                            if anode.name == "location":
+                                anode.setProp('xml:base', self.conf.baseurl)
+                            anode = anode.next
+
                     output = node.serialize('UTF-8', self.conf.pretty)
(Continue reading)

James Antill | 7 Jan 06:11 2010

createrepo/readMetadata.py

 createrepo/readMetadata.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3b157d0ccc2a4c8971c64ec6f9fb4ea3a9c17c5
Author: Dennis Gregorovic <dgregor <at> redhat.com>
Date:   Thu Jan 7 00:11:14 2010 -0500

    Convert stat mtime to int so comparison can work, --update, BZ 553030

diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
index 285e54d..6a5055e 100644
--- a/createrepo/readMetadata.py
+++ b/createrepo/readMetadata.py
 <at>  <at>  -132,7 +132,7  <at>  <at>  class MetadataIndex(object):
                 #ignore non files
                 return
             #check size and mtime
-            if st.st_size != size:
+            if int(st.st_size) != size:
                 if self.opts.get('verbose'):
                     print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath)
                 return
Dennis Gregorovic | 7 Jan 14:40 2010
Picon

Re: createrepo/readMetadata.py

On Thu, 2010-01-07 at 05:11 +0000, James Antill wrote: 
> createrepo/readMetadata.py |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> New commits:
> commit c3b157d0ccc2a4c8971c64ec6f9fb4ea3a9c17c5
> Author: Dennis Gregorovic <dgregor <at> redhat.com>
> Date:   Thu Jan 7 00:11:14 2010 -0500
> 
>     Convert stat mtime to int so comparison can work, --update, BZ 553030
> 
> diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
> index 285e54d..6a5055e 100644
> --- a/createrepo/readMetadata.py
> +++ b/createrepo/readMetadata.py
>  <at>  <at>  -132,7 +132,7  <at>  <at>  class MetadataIndex(object):
>                  #ignore non files
>                  return
>              #check size and mtime
> -            if st.st_size != size:
> +            if int(st.st_size) != size:
>                  if self.opts.get('verbose'):
>                      print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath)
>                  return

Looks like this is the wrong change.  It should be a few lines lower:

-            if st.st_mtime != mtime:
+            if int(st.st_mtime) != mtime:

(Continue reading)

James Antill | 7 Jan 17:50 2010

createrepo/readMetadata.py

 createrepo/readMetadata.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0bf9a7f48786810515d4b530b91cb2bbd01a391c
Author: Dennis Gregorovic <dgregor <at> redhat.com>
Date:   Thu Jan 7 11:50:37 2010 -0500

    Fixed, convert stat mtime to int so comparison can work, --update, BZ 553030

diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
index 6a5055e..6711d30 100644
--- a/createrepo/readMetadata.py
+++ b/createrepo/readMetadata.py
 <at>  <at>  -132,11 +132,11  <at>  <at>  class MetadataIndex(object):
                 #ignore non files
                 return
             #check size and mtime
-            if int(st.st_size) != size:
+            if st.st_size != size:
                 if self.opts.get('verbose'):
                     print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath)
                 return
-            if st.st_mtime != mtime:
+            if int(st.st_mtime) != mtime:
                 if self.opts.get('verbose'):
                     print _("Modification time changed for %s") % filepath
                 return
Ville Skyttä | 18 Jan 18:38 2010
Picon
Picon

[PATCH 2/2] Ignore *.py[co].

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..539da74
--- /dev/null
+++ b/.gitignore
 <at>  <at>  -0,0 +1  <at>  <at> 
+*.py[co]
--

-- 
1.6.2.5
Ville Skyttä | 18 Jan 18:38 2010
Picon
Picon

[PATCH 1/2] Remove outdated comment about --baseurl.

At least yum uses it nowadays.
---
 docs/createrepo.8 |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/docs/createrepo.8 b/docs/createrepo.8
index 80c4464..6b7195f 100644
--- a/docs/createrepo.8
+++ b/docs/createrepo.8
 <at>  <at>  -12,8 +12,7  <at>  <at>  createrepo \- Create repomd (xml-rpm-metadata) repository

 .SH "OPTIONS"
 .IP "\fB\-u --baseurl\fP <url>"
-Optional base url location for all files. (not used by any clients at this
-time)
+Optional base URL location for all files.
 .IP "\fB\-o --outputdir\fP <url>"
 Optional output directory (useful for read only media).
 .IP "\fB\-x --exclude\fP <package>"
--

-- 
1.6.2.5
Seth Vidal | 18 Jan 21:05 2010

Re: [PATCH 2/2] Ignore *.py[co].


On Mon, 18 Jan 2010, Ville Skyttä wrote:

> ---
> .gitignore |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
> create mode 100644 .gitignore
>
> diff --git a/.gitignore b/.gitignore
> new file mode 100644
> index 0000000..539da74
> --- /dev/null
> +++ b/.gitignore
>  <at>  <at>  -0,0 +1  <at>  <at> 
> +*.py[co]
> -- 
> 1.6.2.5

check it in.

thanks,
-sv
_______________________________________________
Rpm-metadata mailing list
Rpm-metadata <at> lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/rpm-metadata
Ville Skyttä | 18 Jan 21:46 2010

2 commits - docs/createrepo.8 .gitignore

 .gitignore        |    1 +
 docs/createrepo.8 |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 793d16c324b3e60b473c38f09849eb723a619d83
Author: Ville Skyttä <ville.skytta <at> iki.fi>
Date:   Fri Sep 25 00:15:38 2009 +0300

    Ignore *.py[co].

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..539da74
--- /dev/null
+++ b/.gitignore
 <at>  <at>  -0,0 +1  <at>  <at> 
+*.py[co]
commit d9f5ac61a7cd26e73ebe13a5696e9aa07e4a9048
Author: Ville Skyttä <ville.skytta <at> iki.fi>
Date:   Mon Jan 26 21:28:26 2009 +0200

    Remove outdated comment about --baseurl.

    At least yum uses it nowadays.

diff --git a/docs/createrepo.8 b/docs/createrepo.8
index 80c4464..6b7195f 100644
--- a/docs/createrepo.8
+++ b/docs/createrepo.8
(Continue reading)

Ville Skyttä | 18 Jan 21:47 2010

genpkgmetadata.py

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

New commits:
commit 99d956fc49e7eae62dbe4ea46c42c21eca1f6304
Author: Ville Skyttä <ville.skytta <at> iki.fi>
Date:   Mon Jan 18 22:47:18 2010 +0200

    Add missing space in --checkts help string.

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index cf3dcd9..965ab4c 100755
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
 <at>  <at>  -62,7 +62,7  <at>  <at>  def parse_args(args, conf):
     parser.add_option("-c", "--cachedir", default=None,
         help="set path to cache dir")
     parser.add_option("-C", "--checkts", default=False, action="store_true",
-        help="check timestamps on files vs the metadata to see" \
+        help="check timestamps on files vs the metadata to see " \
            "if we need to update")
     parser.add_option("-d", "--database", default=False, action="store_true",
         help="create sqlite database files")
_______________________________________________
Rpm-metadata mailing list
Rpm-metadata <at> lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/rpm-metadata
(Continue reading)


Gmane