createrepo.spec docs/Makefile docs/mergerepo.1 mergerepo.py

 createrepo.spec  |    1 
 docs/Makefile    |    3 ++
 docs/mergerepo.1 |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mergerepo.py     |    3 ++
 4 files changed, 63 insertions(+)

New commits:
commit 5610a17cd6c5118b8af750683aa5c9703450da4b
Author: Seth Vidal <[email protected]>
Date:   Tue Oct 21 15:33:51 2008 -0400

    mergerepo man page
    todos added to mergerepo

diff --git a/createrepo.spec b/createrepo.spec
index fc49870..e18999c 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -38,6 +38,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{_bindir}/mergerepo
 %{_mandir}/man8/createrepo.8*
 %{_mandir}/man1/modifyrepo.1*
+%{_mandir}/man1/mergerepo.1*
 %{python_sitelib}/createrepo
 
 %changelog
diff --git a/docs/Makefile b/docs/Makefile
index 5accea6..2e70622 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -44,6 +44,7 @@ install: all installdirs
 	mkdir -p $(DESTDIR)$(mandir)/man1
 	$(INSTALL_DATA) createrepo.8 $(DESTDIR)$(mandir)/man8/createrepo.8
 	$(INSTALL_DATA) modifyrepo.1 $(DESTDIR)$(mandir)/man1/modifyrepo.1
+	$(INSTALL_DATA) mergerepo.1 $(DESTDIR)$(mandir)/man1/mergerepo.1
 
 
 uninstall:
@@ -74,6 +75,7 @@ distfiles:
 	cp \
 	$(srcdir)/createrepo.8 \
 	$(srcdir)/modifyrepo.1 \
+	$(srcdir)/mergerepo.1 \
 	$(srcdir)/Makefile \
 	$(top_srcdir)/.disttmp/$$distdir/docs
 
@@ -83,6 +85,7 @@ dailyfiles:
 	cp \
 	$(srcdir)/createrepo.8 \
 	$(srcdir)/modifyrepo.1 \
+	$(srcdir)/mergerepo.1 \
 	$(srcdir)/Makefile \
 	$(top_srcdir)/.disttmp/$$distdir/docs
 
diff --git a/docs/mergerepo.1 b/docs/mergerepo.1
new file mode 100644
index 0000000..2529e7a
--- /dev/null
+++ b/docs/mergerepo.1
@@ -0,0 +1,56 @@
+.TH "mergerepo" "1" "2008 Oct 21" "Seth Vidal" ""
+
+.SH "NAME"
+mergerepo \- Merge multiple repositories together
+
+.SH "SYNOPSIS"
+\fBmergerepo\fP --repo repo1 --repo repo2
+.PP
+
+.SH "DESCRIPTION"
+\fBmergerepo\fP is a program that allows you merge multiple repositories
+into a single repository while referring to the remote location for all
+packages.
+
+.SH "OPTIONS"
+.IP "\fB\-r --repo\fP <url>"
+Url to a repository to be merged.
+
+.IP "\fB\-o --outputdir <directory>\fP"
+Path where merged repository metadata should be written to. If not specified
+repository metadata will be written to `pwd`/merged_repo/.
+
+.IP "\fB\-d --database\fP"
+Generate sqlite databases of the merged repository metadata.
+
+.IP "\fB\-a --archlist\fP"
+Specify a comma-separated list of architectures to use. Defaults to ALL.
+
+.IP "\fB\--nogroups\fP"
+Do not merge/include groups metadata in the repository.
+
+.IP "\fB\--noupdateinfo\fP"
+Do not merge/include updateinfo metadata in the repository.
+
+
+.SH "EXAMPLES"
+.PP
+$ \fBmergerepo\fP --repo=http://myurl.org/repo1 --repo=http://myurl.org/repo2 -d -o /tmp/mymergedrepo 
+
+.PP 
+.SH "SEE ALSO"
+.I createrepo (8)
+
+.PP 
+.SH "AUTHORS"
+.nf 
+Seth Vidal <[email protected]>
+.fi 
+
+.PP 
+.SH "BUGS"
+Any bugs which are found should be emailed to the mailing list:
[email protected] or filed as tickets at:
+http://createrepo.baseurl.org/
+
+.fi
diff --git a/mergerepo.py b/mergerepo.py
index f1225c6..6b0a7ff 100755
--- a/mergerepo.py
+++ b/mergerepo.py
@@ -22,6 +22,9 @@ from optparse import OptionParser
 
 #TODO:
 # excludes?
+# handle content/distro tags
+# support revision?
+
 
 def parse_args(args):
     """Parse our opts/args"""