Process also disabled repositories.

Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>
semplice · Apr 20, 2015 · 39b3452 · 39b3452
1 parent 9efca45
commit 39b3452
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+__pycache__/
diff --git a/libchannels/__pycache__/__init__.cpython-34.pyc b/libchannels/__pycache__/__init__.cpython-34.pyc
diff --git a/libchannels/__pycache__/channel.cpython-34.pyc b/libchannels/__pycache__/channel.cpython-34.pyc
diff --git a/libchannels/__pycache__/common.cpython-34.pyc b/libchannels/__pycache__/common.cpython-34.pyc
diff --git a/libchannels/__pycache__/config.cpython-34.pyc b/libchannels/__pycache__/config.cpython-34.pyc
diff --git a/libchannels/__pycache__/discovery.cpython-34.pyc b/libchannels/__pycache__/discovery.cpython-34.pyc
diff --git a/libchannels/__pycache__/repository.cpython-34.pyc b/libchannels/__pycache__/repository.cpython-34.pyc
diff --git a/libchannels/channel.py b/libchannels/channel.py
@@ -83,7 +83,8 @@ def __str__(self):
 
 	def check(self, origin, label, codename, source_entry):
 		"""
-		Returns True if the given InRelease file stream 
+		Sets the given SourceEntry into self.repositories if it matches
+		the other information given.
 		"""
 
 		for repository in self.repositories:
@@ -102,11 +103,21 @@ def check(self, origin, label, codename, source_entry):
 			# Good!
 			self.repositories[repository] = source_entry
 
+	def is_sourceentry_enabled(self, repository):
+		"""
+		Returns True if the sourceentry is enabled, False if not.
+		"""
+
+		return (
+			type(repository) == SourceEntry and
+			not repository.disabled
+		) 
+
 	@property
 	def enabled(self):
 		"""
 		Returns True if the channel is enabled, False if not.
 		"""
 
 		#return (not (None in self.repositories.values()))
-		return (not (False in [(type(x) == SourceEntry) for x in self.repositories.values()]))
+		return (not (False in [self.is_sourceentry_enabled(x) for x in self.repositories.values()]))
diff --git a/libchannels/discovery.py b/libchannels/discovery.py
@@ -60,7 +60,7 @@ def discover(self):
 
 		# Loop through enabled repositories to get a list of enabled channels
 		for repository in libchannels.common.sourceslist:
-			if repository.disabled or repository.uri == "" or repository.type == "deb-src":
+			if repository.uri == "" or repository.type == "deb-src":
 				continue
 
 			# Generate InRelease filename from repository URI