[yum-git] 3 commits - plugins/aliases plugins/versionlock yum-utils.spec

[James Antill]

 plugins/aliases/aliases            |   13 ++++++++++---
 plugins/versionlock/versionlock.py |    7 +------
 yum-utils.spec                     |    6 +++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 350432272a2d7cb4bc0fa928271fe1b8aca4b256
Author: James Antill <james at and.org>
Date:   Wed Feb 20 17:13:20 2008 -0500

    Try and make the repo enable aliases more useful

diff --git a/plugins/aliases/aliases b/plugins/aliases/aliases
index 90a6a31..2d5a7d2 100644
--- a/plugins/aliases/aliases
+++ b/plugins/aliases/aliases
@@ -5,14 +5,21 @@
 
 DEV --enablerepo=development
 UPT --enablerepo=updates-testing
-SEC --security
 
 SRC --enablerepo=fedora-source    --enablerepo=updates-source
+DEVSRC --enablerepo=development-source
+UPTSRC --enablerepo=updates-testing-source
 # Note that we/you can move to =X,Y in 3.2.9 onwards.
 DBG --enablerepo=fedora-debuginfo --enablerepo=updates-debuginfo
-ALLSRC --enablerepo=*-source
-ALLDBG --enablerepo=*-debuginfo
+DEVDBG --enablerepo=development-debuginfo
+UPTDBG --enablerepo=updates-testing-debuginfo
+
+ALLSRC SRC DEVSRC UPTSRC
+ALLDBG DBG DEVDBG UPTDBG
 
+ALL DEV UPT ALLSRC ALLDBG
+
+SEC --security
 FORCE --skip-broken --disableexcludes=all
 
 up   upgrade
commit 7e6e23d21b6a9c8f01fdcbecaa8613b6cdb0fcb7
Author: James Antill <james at and.org>
Date:   Wed Feb 20 13:18:06 2008 -0500

    Create an empty versionlock file, so we can have it enabled by default

diff --git a/plugins/versionlock/versionlock.list b/plugins/versionlock/versionlock.list
new file mode 100644
index 0000000..e69de29
diff --git a/yum-utils.spec b/yum-utils.spec
index 10aefd0..772aa96 100644
--- a/yum-utils.spec
+++ b/yum-utils.spec
@@ -258,7 +258,7 @@ for plug in $plugins; do
     install -m 644 $plug/*.py $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 done
 install -m 644 aliases/aliases $RPM_BUILD_ROOT/%{_sysconfdir}/yum/aliases.conf
-
+install -m 644 versionlock/versionlock.list $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -330,6 +330,7 @@ fi
 %defattr(-, root, root)
 %doc plugins/versionlock/README
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.list
 /usr/lib/yum-plugins/versionlock.*
 
 %files -n yum-tsflags
@@ -418,6 +419,9 @@ fi
 
 
 %changelog
+* Wed Feb 20 2008 James Antill <james at fedoraproject.org>
+- Add empty versionlock file
+
 * Fri Feb  1 2008 James Antill <james at fedoraproject.org>
 - Add filter-data plugin
 
commit d7bec6b1dd136bbf25551e76b984dd0798a91457
Author: James Antill <james at and.org>
Date:   Wed Feb 20 11:13:31 2008 -0500

    Revert "Fix non-existant version lock file SNAFU"
    
    This reverts commit 3a2d1fdf53635a8929693494b4fbacc2a5bf4545.
    
     All bugs are features for someone.

diff --git a/plugins/versionlock/versionlock.py b/plugins/versionlock/versionlock.py
index 0e558c2..664e887 100644
--- a/plugins/versionlock/versionlock.py
+++ b/plugins/versionlock/versionlock.py
@@ -20,7 +20,6 @@ from yum.plugins import TYPE_CORE
 from rpmUtils.miscutils import splitFilename, compareEVR
 import urlgrabber
 import urlgrabber.grabber
-import os
 
 requires_api_version = '2.1'
 plugin_type = (TYPE_CORE,)
@@ -31,15 +30,11 @@ def vl_search(conduit, name):
     return conduit._base.pkgSack.searchNevra(name=name)
 
 def exclude_hook(conduit):
+    conduit.info(2, 'Reading version lock configuration')
     locklist = []
     location = conduit.confString('main', 'locklist')
     if not location:
         raise PluginYumExit('Locklist not set')
-
-    if location.startswith('/') and not os.path.exists(location):
-        return # Don't die if the file doesn't exist, just treat as empty
-
-    conduit.info(2, 'Reading version lock configuration')
     try:
         llfile = urlgrabber.urlopen(location)
         for line in llfile.readlines():