[yum-cvs] 2 commits - repo-rss.py

[Seth Vidal]

 repo-rss.py |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 531291c863fd74fe9c94c2bc5acbf719079acc4a
Merge: 80f420a... e447618...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 15 11:57:19 2007 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils:
      provide more verbose failure information with higher debug level
      check for yum-updatesd being on the bus in case we're using system activation
      refresh-updatesd: documentation updates
      refresh-updatesd: Remove repos_setup check.
      refresh-updatesd: some tweaks
      fixed issue in debuginfo-install there make it fail with plugins there uses conduit.getPackages() (rhbz #249742)
      chmod +x *.py (make it a little easier to test)
      fixed UnboundLocalError: local variable 'r_e' referenced before assignment in repoquery (convert unicode -> str)
      Make package-cleanup --orphans work as no root (rhbz #253352)
      Fixed yumdownloader --url output to show the right url (rhbz #301981)
      Allow package name globs on the list-sec/info-sec lines
      We need to catch when we install a kmod with a lower VR than a kmod of
      Don't print metadata more than once

commit 80f420a9828537c94a172286f15b1f211de2b6af
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Oct 15 11:23:17 2007 -0400

    - apply guid patch from ricky zhou to repo-rss.xml
    - add -a option to specify arches that repo-rss should use

diff --git a/repo-rss.py b/repo-rss.py
old mode 100644
new mode 100755
index 26cfa58..0dceff8
--- a/repo-rss.py
+++ b/repo-rss.py
@@ -124,7 +124,7 @@ class RepoRSS:
         item.newChild(None, 'title', title)
         date = time.gmtime(float(pkg.returnSimple('buildtime')))
         item.newChild(None, 'pubDate', time.strftime(rfc822_format, date))
-        item.newChild(None, 'guid', pkg.returnSimple('id'))
+        item.newChild(None, 'guid', pkg.returnSimple('id')).setProp("isPermaLink", "false")        
         link = url + '/' + pkg.returnSimple('relativepath')
         item.newChild(None, 'link', escape(link))
     
@@ -198,13 +198,17 @@ def main(options, args):
                 repo.enable()
 
     try:
-        my.doRepoSetup()
+        my._getRepos()
     except yum.Errors.RepoError, e:
         print >> sys.stderr, '%s' % e
         print 'Cannot continue'
         sys.exit(1)
     print 'Reading in repository metadata - please wait....'
-    my.doSackSetup()
+    if len(options.arches):
+        my._getSacks(archlist=options.arches)
+    else:
+        my._getSacks()
+
     for repo in my.repos.listEnabled():
             
         try:
@@ -263,6 +267,8 @@ if __name__ == "__main__":
                       help="Use a temp dir for storing/accessing yum-cache")
     parser.add_option("-g", action='store_true', dest='groups', default=False,
                       help="Generate one feed per package group")
+    parser.add_option("-a", action='append', dest='arches', default=[],
+                      help="arches to use - can be listed more than once")
 
     (options, args) = parser.parse_args()