[PATCH] Don't warn needlessly when repo rpm_list is empty

[Ian Ward Comfort]

Since our rsync, RHN (and formerly APT) repository mirrors don't support
partial mirroring with --rpm-list, we warn when a selective list is provided
and ignored. Since it's easier (using the standard user interfaces) to empty a
mistakenly-set list than to reset it to "", let's not warn when the list is
empty.
---
 cobbler/action_reposync.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index e73dc4a..a1383e4 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -208,7 +208,7 @@ class RepoSync:
         if not repo.mirror_locally:
             utils.die(self.logger,"rsync:// urls must be mirrored locally, yum
cannot access them directly")
 
-        if repo.rpm_list != "":
+        if repo.rpm_list != "" and repo.rpm_list != []:
             self.logger.warning("--rpm-list is not supported for rsync'd
repositories")
 
         # FIXME: don't hardcode
@@ -250,7 +250,7 @@ class RepoSync:
 
         # detect cases that require special handling
 
-        if repo.rpm_list != "":
+        if repo.rpm_list != "" and repo.rpm_list != []:
             has_rpm_list = True
 
         # create yum config file for use by reposync
@@ -438,7 +438,7 @@ class RepoSync:
 #
 #        # detect cases that require special handling
 #
-#        if repo.rpm_list != "":
+#        if repo.rpm_list != "" and repo.rpm_list != []:
 #            utils.die(self.logger,"has_rpm_list not yet supported on apt
repos")
 #
 #        if not repo.arch:
-- 
1.7.0.2

[Ian Ward Comfort]

On 19 Mar 2010, at 12:42 AM, Ian Ward Comfort wrote:
>  @@ -250,7 +250,7 @@ class RepoSync:
>
>          # detect cases that require special handling
>
>  -        if repo.rpm_list != "":
>  +        if repo.rpm_list != "" and repo.rpm_list != []:
>              has_rpm_list = True
>
>          # create yum config file for use by reposync 

These updated checks (in rsync_sync, rhn_sync, apt_sync) now match the  
one in yum_sync, by the way.

-- 
Ian Ward Comfort <icomfort(a)stanford.edu&gt;
Systems Team Lead, Academic Computing Services, Stanford University