Added preliminary support for proposed channel components.

Proposed channels component won't influence the "channel disabled" state and don't get
enabled automatically.

Proposed components permit to provide updates strictly related to a channel without the need
of creating a new one.

Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>

dryrun.py

@@ -28,6 +28,8 @@
 print("semplice-current", not (False in resolver.relations["semplice-current"]))
 print(resolver.is_channel_enableable("semplice-jessie"))
 
+print("semplice-current enabled: %s" % discovery.cache["semplice-current"].enabled)
+
 # Print blockers for some channels
 for channel in ["semplice-current", "semplice-jessie"]:
 	print("%s blockers: %s" % (channel, resolver.get_channel_blockers(channel)))

libchannels/channel.py

@@ -84,7 +84,7 @@ def disable(self):
 		print("Disabling %s channel..." % self.channel_name)
 
 		for repository, source_entry in self.repositories.items():
-			source_entry.set_enabled(False)
+			if source_entry: source_entry.set_enabled(False)
 
 		libchannels.common.sourceslist.save()
 
@@ -96,6 +96,10 @@ def enable(self):
 		print("Enabling %s channel..." % self.channel_name)
 
 		for repository, source_entry in self.repositories.items():
+			if self.is_proposed(repository):
+				# Proposed components should be enabled manually
+				continue
+
 			if type(source_entry) == SourceEntry:
 				source_entry.set_enabled(True)
 			else:
@@ -167,15 +171,31 @@ def check(self, uri, origin, label, codename, source_entry):
 			# Good!
 			self.repositories[repository] = source_entry
 
-	def is_sourceentry_enabled(self, repository):
+	def is_proposed(self, name):
+		"""
+		Returns True if the repository name is proposed, False if not.
+		"""
+
+		return (
+			"proposed" in self[name] and
+			self[name].getboolean("proposed")
+		)
+
+	def is_sourceentry_enabled(self, name, repository, skip_proposed=False):
 		"""
 		Returns True if the sourceentry is enabled, False if not.
 		"""
 
 		return (
-			type(repository) == SourceEntry and
-			not repository.disabled
-		) 
+			(
+				type(repository) == SourceEntry and
+				not repository.disabled
+			) or
+			(
+				skip_proposed and
+				self.is_proposed(name)
+			)
+		)
 
 	@property
 	def enabled(self):
@@ -184,4 +204,4 @@ def enabled(self):
 		"""
 
 		#return (not (None in self.repositories.values()))
-		return (not (False in [self.is_sourceentry_enabled(x) for x in self.repositories.values()]))
+		return (not (False in [self.is_sourceentry_enabled(x, y, skip_proposed=True) for x, y in self.repositories.items()]))

semplice-current.channel

@@ -15,3 +15,10 @@ default_mirror = http://archive.semplice-linux.org/semplice/archive/
 origin = Semplice Project
 codename = changes-unstable
 components = main contrib non-free
+
+[proposed]
+default_mirror = http://archive.semplice-linux.org/semplice/archive/
+origin = Semplice Project
+codename = proposed-unstable
+components = main contrib non-free
+proposed = yes