summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-17 09:05:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-17 09:05:01 +0000
commit76c0c63ed3e198686814cc038ede925d6450da73 (patch)
tree4fb202e2dfa76561bd344229ea8da563df4e0b36
parent20934d75ed9f83b46aae224a1639d2301613e903 (diff)
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/#.+$//;