summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-08-17 09:05:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-08-17 09:05:01 +0000
commita74bb3b4173ed5cd86bece29312c2103bd79dc37 (patch)
tree6178d512bc493e700ec307a3536933f0b712bdac
parent08b6c2294f8adeac31191894a95203cde3142fe7 (diff)
downloadmaster-31e0f0ae-a74bb3b4173ed5cd86bece29312c2103bd79dc37.tar.gz
master-31e0f0ae-a74bb3b4173ed5cd86bece29312c2103bd79dc37.tar.bz2
master-31e0f0ae-a74bb3b4173ed5cd86bece29312c2103bd79dc37.zip
rename feeds.conf to feeds.conf.default, make feeds.conf override feeds.conf.default this makes it possible to change the feeds lists without having the version control system record it as a change
SVN-Revision: 12328
-rw-r--r--feeds.conf.default (renamed from feeds.conf)0
-rwxr-xr-xscripts/feeds4
2 files changed, 3 insertions, 1 deletions
diff --git a/feeds.conf b/feeds.conf.default
index 7463bb6448..7463bb6448 100644
--- a/feeds.conf
+++ b/feeds.conf.default
diff --git a/scripts/feeds b/scripts/feeds
index 6b09f7ee41..ee2f108efd 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -23,7 +23,9 @@ sub parse_config() {
my $line = 0;
my %name;
- open FEEDS, "feeds.conf";
+ open FEEDS, "feeds.conf" or
+ open FEEDS, "feeds.conf.default" or
+ die "Unable to open feeds configuration";
while (<FEEDS>) {
chomp;
s/#.+$//;