From 53038b1d068eb35c28136b80694195b5bc29c950 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 15 Sep 2006 17:48:11 +0000
Subject: [PATCH] smart-selection.mk: Add target smart-config

  - Fix abort on adding channel list
  - Add target smart-config
  - Fix handling of [rpm-sys] channel in smart channel list creation
---
 make/smart-selection.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index f3990bf6..8e28652c 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -20,9 +20,10 @@ distclean: clean
 upload: upload.done
 install-smart: rpm-install-smart.done
 commit: selection.done channels.done
-	cvs add $(SELECTION) $(CHANNEL_LIST)
+	cvs add $(SELECTION) $(CHANNEL_LIST) || exit 0
 	cvs commit -m "o updated by target $@"
 smart-update: smart-update.done
+smart-config: smart-config.done
 
 # === rules
 selection.done: $(MODDIR)/make/smart-selection.mk
@@ -33,7 +34,7 @@ selection.done: $(MODDIR)/make/smart-selection.mk
 	touch $@
 
 channels.done: $(MODDIR)/make/smart-selection.mk
-	smart channel --show | sed '/\[rpm-sys\]/,/\[/ d' > $(CHANNEL_LIST)
+	smart channel --show | sed '/\[rpm-sys\]/,+3 d' > $(CHANNEL_LIST)
 	touch $@
 
 upload.done: selection.done
@@ -57,8 +58,13 @@ smart-update.done:
 %-packages.txt-install: smart-update.done
 	cat $*-packages.txt | xargs sudo smart install -y
 
-%-channels.txt-replace: smart-update.done
+%-channels.txt-replace:
 	sudo smart channel -y --remove-all
 	sudo smart channel -y --add $*-channels.txt
 	sudo smart update || exit 0
 
+smart-config.done:
+	sudo smart config --set rpm-check-signatures=false
+	sudo smart config --set remove-packages=false
+	touch $@
+