aboutsummaryrefslogtreecommitdiffstats
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
commita9bbf998e4e173f4f0085a68c674db803ac69a5e (patch)
tree4fb202e2dfa76561bd344229ea8da563df4e0b36
parent34a8a11664b0e9393bd832a1de0c2d081da67ba2 (diff)
downloadmaster-187ad058-a9bbf998e4e173f4f0085a68c674db803ac69a5e.tar.gz
master-187ad058-a9bbf998e4e173f4f0085a68c674db803ac69a5e.tar.bz2
master-187ad058-a9bbf998e4e173f4f0085a68c674db803ac69a5e.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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12328 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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/#.+$//;