From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 23 Aug 2015 09:35:46 +0000 (+0000)
Subject: scripts/feeds: allow export of feeds with static revisions
X-Git-Tag: reboot~2205
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d54d4434978a616ac76ba7893e52b32385c4575;p=oweals%2Fopenwrt.git

scripts/feeds: allow export of feeds with static revisions

Add a switch to scripts/feeds that allows listing the feeds with their
currently checked out revisions in feeds.conf compatible format.

This allows providing a feeds.conf for public builds to make replication
of the build easier.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46706
---

diff --git a/scripts/feeds b/scripts/feeds
index 1da44f539f..79b5284e9e 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -314,7 +314,7 @@ sub list_feed {
 sub list {
 	my %opts;
 
-	getopts('r:d:nsh', \%opts);
+	getopts('r:d:nshf', \%opts);
 	if ($opts{h}) {
 		usage();
 		return 0;
@@ -342,6 +342,14 @@ sub list {
 			if ($opts{d}) {
 				printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
 			}
+			elsif ($opts{f}) {
+				my $uri = join(", ", @{$feed->[2]});
+				if ($revision ne "local" && $revision ne "X") {
+					$uri =~ s/[;^].*//;
+					$uri .= "^" . $revision;
+				}
+				printf "%s %s %s\n", $feed->[0], $feed->[1], $uri;
+			}
 			else {
 				printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
 			}
@@ -758,6 +766,7 @@ Commands:
 	    -s :            List of feed names and their URL.
 	    -r <feedname>:  List packages of specified feed.
 	    -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
+	    -f :            List feeds in feeds.conf compatible format (when using -s).
 
 	install [options] <package>: Install a package
 	Options: