public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2011-10-26  3:07 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2011-10-26  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f92b63f4fa81a6e4cc74b68cd8c7be9943ef84a3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Aug  2 08:11:04 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 08:11:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git;a=commit;h=f92b63f4

Improve handling of description extraction, add warnings on mismatch

---
 layman/dbtools/gitoliteparser.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/layman/dbtools/gitoliteparser.py b/layman/dbtools/gitoliteparser.py
index 141088a..19baf73 100644
--- a/layman/dbtools/gitoliteparser.py
+++ b/layman/dbtools/gitoliteparser.py
@@ -66,9 +66,11 @@ class RepoDatabase:
 
                     elif matcher is _desc_line:
                         desc_repo = m.group(1)
+                        if repo != desc_repo:
+                            print('WARNING: Looks like description of repo "%s" mentions repo "%s", by mistake' % (repo, desc_repo))
                         desc_contact = m.group(2)
                         desc_desc = m.group(3)
-                        desc_map[desc_repo] = (desc_contact, desc_desc)
+                        desc_map[repo] = (desc_contact, desc_desc)
 
                         self._add(repo, terms_status, is_overlay, dont_add_reason)
                         terms_status = None



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2011-10-26  3:07 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2011-10-26  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     4c72ab6b5781e1e95fafb18c9a60c5f178efef8d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Oct 26 03:07:17 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 03:07:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git;a=commit;h=4c72ab6b

Fix a bug in the gitolite config parser

---
 layman/dbtools/gitoliteparser.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/layman/dbtools/gitoliteparser.py b/layman/dbtools/gitoliteparser.py
index 25708f6..4bb6bb7 100644
--- a/layman/dbtools/gitoliteparser.py
+++ b/layman/dbtools/gitoliteparser.py
@@ -11,7 +11,7 @@ import re
 _repo_line = re.compile('^repo ([^ ]+)')
 _terms_status_line = re.compile('^# gentoo-terms-status = (.+)$')
 _overlay_marker_line = re.compile('^# gentoo-is-overlay = (True|False)')
-_desc_line = re.compile('^([^ ]+) "(.+ <[^@]+@[^>]+>)" = "(.+)"')
+_desc_line = re.compile('^([^# ][^ ]+) "(.+ <[^@]+@[^>]+>)" = "(.+)"')
 _dont_add_line = re.compile('^# gentoo-dont-add-to-layman = (.+)')
 
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2011-10-26  3:07 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2011-10-26  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     931c95e91ec7a12a88a1ae12a0323a1753c6489e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Aug  2 08:13:09 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 08:13:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git;a=commit;h=931c95e9

Support false is_overlay

---
 layman/dbtools/gitoliteparser.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/layman/dbtools/gitoliteparser.py b/layman/dbtools/gitoliteparser.py
index 822199e..25708f6 100644
--- a/layman/dbtools/gitoliteparser.py
+++ b/layman/dbtools/gitoliteparser.py
@@ -94,7 +94,7 @@ class RepoDatabase:
             print('repo %s' % repo)
             if terms_status:
                 print('\t# gentoo-terms-status = %s' % terms_status)
-            if is_overlay:
+            if is_overlay is not None:
                 print('\t# gentoo-is-overlay = %s' % str(is_overlay))
             if dont_add_reason:
                 print('\t# gentoo-dont-add-to-layman = %s' % dont_add_reason)



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2011-10-26  3:07 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2011-10-26  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5b6da4535d475484d929e3b7049cac75fcd1109f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Aug  2 08:13:17 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 08:13:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git;a=commit;h=5b6da453

Improve handling of description extraction, add warnings on mismatch

---
 layman/dbtools/gitoliteparser.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/layman/dbtools/gitoliteparser.py b/layman/dbtools/gitoliteparser.py
index 19baf73..822199e 100644
--- a/layman/dbtools/gitoliteparser.py
+++ b/layman/dbtools/gitoliteparser.py
@@ -73,6 +73,7 @@ class RepoDatabase:
                         desc_map[repo] = (desc_contact, desc_desc)
 
                         self._add(repo, terms_status, is_overlay, dont_add_reason)
+                        repo = None
                         terms_status = None
                         is_overlay = None
                         dont_add_reason = None



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2013-05-05 17:08 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2013-05-05 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     97700a989a852074b0f164103c067a29904ca00a
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun May  5 17:08:58 2013 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun May  5 17:08:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git;a=commit;h=97700a98

Fix crash on non-ascii repo owner name

---
 layman/dbtools/gitoliteextractor.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/layman/dbtools/gitoliteextractor.py b/layman/dbtools/gitoliteextractor.py
index 3d77831..df52313 100755
--- a/layman/dbtools/gitoliteextractor.py
+++ b/layman/dbtools/gitoliteextractor.py
@@ -193,7 +193,7 @@ for section_name in gitolite_conf.names():
         owner_name = owner.find('name')
         if owner_name == None:
             owner_name = ET.Element('name')
-            owner_name.text = _owner_match.group(1)
+            owner_name.text = _owner_match.group(1).decode('utf-8')
             log.log('owner name', owner_name.text)
 
         owner_email = owner.find('email')


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/
@ 2015-03-29 17:46 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2015-03-29 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3daba500ec79d3cce99da63f245e4352298dc1cf
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Mar 29 15:56:58 2015 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 15:56:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/repositories-xml-format.git/commit/?id=3daba500

Support "#gl2#" marker in repo description lines

 layman/dbtools/gitoliteparser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layman/dbtools/gitoliteparser.py b/layman/dbtools/gitoliteparser.py
index 4bb6bb7..d0d268e 100644
--- a/layman/dbtools/gitoliteparser.py
+++ b/layman/dbtools/gitoliteparser.py
@@ -11,7 +11,7 @@ import re
 _repo_line = re.compile('^repo ([^ ]+)')
 _terms_status_line = re.compile('^# gentoo-terms-status = (.+)$')
 _overlay_marker_line = re.compile('^# gentoo-is-overlay = (True|False)')
-_desc_line = re.compile('^([^# ][^ ]+) "(.+ <[^@]+@[^>]+>)" = "(.+)"')
+_desc_line = re.compile('^(?:#gl2# )?([^# ][^ ]+) "(.+ <[^@]+@[^>]+>)" = "(.+)"')
 _dont_add_line = re.compile('^# gentoo-dont-add-to-layman = (.+)')
 
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-29 17:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-05 17:08 [gentoo-commits] proj/repositories-xml-format:master commit in: layman/dbtools/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2015-03-29 17:46 Sebastian Pipping
2011-10-26  3:07 Sebastian Pipping
2011-10-26  3:07 Sebastian Pipping
2011-10-26  3:07 Sebastian Pipping
2011-10-26  3:07 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox