[Mageia-sysadm] [265] rename repsys to mgarepo, RepSys to MgaRepo, and update docs and examples for Mageia
root at mageia.org
root at mageia.org
Tue Jan 11 01:36:00 CET 2011
Revision: 265
Author: boklm
Date: 2011-01-11 01:35:59 +0100 (Tue, 11 Jan 2011)
Log Message:
-----------
rename repsys to mgarepo, RepSys to MgaRepo, and update docs and examples for Mageia
Modified Paths:
--------------
build_system/mgarepo/trunk/MANIFEST.in
build_system/mgarepo/trunk/MgaRepo/ConfigParser.py
build_system/mgarepo/trunk/MgaRepo/binrepo.py
build_system/mgarepo/trunk/MgaRepo/cgi/soapserver.py
build_system/mgarepo/trunk/MgaRepo/cgi/submit.py
build_system/mgarepo/trunk/MgaRepo/cgi/xmlrpcserver.py
build_system/mgarepo/trunk/MgaRepo/cgiutil.py
build_system/mgarepo/trunk/MgaRepo/command.py
build_system/mgarepo/trunk/MgaRepo/commands/authoremail.py
build_system/mgarepo/trunk/MgaRepo/commands/changed.py
build_system/mgarepo/trunk/MgaRepo/commands/ci.py
build_system/mgarepo/trunk/MgaRepo/commands/co.py
build_system/mgarepo/trunk/MgaRepo/commands/create.py
build_system/mgarepo/trunk/MgaRepo/commands/del.py
build_system/mgarepo/trunk/MgaRepo/commands/editlog.py
build_system/mgarepo/trunk/MgaRepo/commands/getspec.py
build_system/mgarepo/trunk/MgaRepo/commands/getsrpm.py
build_system/mgarepo/trunk/MgaRepo/commands/log.py
build_system/mgarepo/trunk/MgaRepo/commands/markrelease.py
build_system/mgarepo/trunk/MgaRepo/commands/patchspec.py
build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py
build_system/mgarepo/trunk/MgaRepo/commands/rpmlog.py
build_system/mgarepo/trunk/MgaRepo/commands/submit.py
build_system/mgarepo/trunk/MgaRepo/commands/switch.py
build_system/mgarepo/trunk/MgaRepo/commands/sync.py
build_system/mgarepo/trunk/MgaRepo/commands/up.py
build_system/mgarepo/trunk/MgaRepo/commands/upload.py
build_system/mgarepo/trunk/MgaRepo/layout.py
build_system/mgarepo/trunk/MgaRepo/log.py
build_system/mgarepo/trunk/MgaRepo/mirror.py
build_system/mgarepo/trunk/MgaRepo/plugins/__init__.py
build_system/mgarepo/trunk/MgaRepo/plugins/ldapusers.py
build_system/mgarepo/trunk/MgaRepo/plugins/sample.py.txt
build_system/mgarepo/trunk/MgaRepo/rpmutil.py
build_system/mgarepo/trunk/MgaRepo/simplerpm.py
build_system/mgarepo/trunk/MgaRepo/svn.py
build_system/mgarepo/trunk/MgaRepo/util.py
build_system/mgarepo/trunk/README
build_system/mgarepo/trunk/README.LDAP
build_system/mgarepo/trunk/create-srpm
build_system/mgarepo/trunk/default.chlog
build_system/mgarepo/trunk/setup.cfg
build_system/mgarepo/trunk/setup.py
Added Paths:
-----------
build_system/mgarepo/trunk/MgaRepo/
build_system/mgarepo/trunk/README.BINREPO
build_system/mgarepo/trunk/mgarepo
build_system/mgarepo/trunk/mgarepo-example.conf
build_system/mgarepo/trunk/mgarepo-ssh
build_system/mgarepo/trunk/mgarepo.8
build_system/mgarepo/trunk/mgarepo.conf
Removed Paths:
-------------
build_system/mgarepo/trunk/BRANCH
build_system/mgarepo/trunk/RepSys/
build_system/mgarepo/trunk/repsys
build_system/mgarepo/trunk/repsys-example.conf
build_system/mgarepo/trunk/repsys-ssh
build_system/mgarepo/trunk/repsys.8
build_system/mgarepo/trunk/repsys.conf
Deleted: build_system/mgarepo/trunk/BRANCH
===================================================================
--- build_system/mgarepo/trunk/BRANCH 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/BRANCH 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,419 +0,0 @@
-================================
-The detached binaries repository
-================================
-
-.. contents::
-
-A brief description
-===================
-
-Ideally, all binaries from packages sources (ie. all the binary files inside
-SOURCES/) will be placed in another subversion repository. This repository
-is called "tarballs repository", "binaries repository" or just "binrepo".
-It will contain mostly the same directory structure of the main repository,
-but instead of having SOURCES and SPECS, it will only have a SOURCES
-directory. Every copy/move operation should happen in both repositories.
-
-In order to allow deceasing binaries from older distributions, each stable
-distro will have its own subversion repository for binary files. repsys
-knows how to access these binrepos by checking which URL defined in the
-"[binrepo]" section of the configuration file matches the path-part of the
-repository being accessed. (see open issues)
-
-The package changelogs will be generated from SVN commit logs in the main
-"plaintext" repository ("txtrepo" for short) only. Old changelogs will be
-preserved, as even empty revisions are preserved in the binaries-filtering
-conversion.
-
-
-Mapping repositories states
----------------------------
-
-In order to allow the use of `repsys {getsrpm,co} -r REV`, repsys will have
-to use a reference in the text repo which will be used to know in what
-state was the binrepo when a binary was uploaded.
-
-We cannot use direct revision number mapping through properties/files/etc
-mainly because we may have multiple binaries repositories, and eventually
-they can be filtered for reducing space, thus can't ensure revisions will
-survive. Thus another mechanism which relies on dates instead of revisions
-numbers is needed.
-
-When a binary is uploaded to the binrepo, the file `sha1.lst` is updated to
-have the files's hash and commited in the main text repo. This file will be
-used as the reference when the user uses -r REV on repsys. repsys will
-checkout the package in the main text repo with -r REV and then will use
-the "Last Changed Date" of `sha1.lst` to checkout the binrepo part. Thus,
-`sha1.lst` should be always commited to the main text repository *after* the
-corresponding binary files have been commited to the binrepo. Hooks in the
-main repository may be used to try to enforce this, by checking if the files
-changed in `sha1.lst` are already commited in the corresponding binrepo.
-
-Computation of `sha1.lst` is unlikely to be an issue:
-
-- it should not happen too often for any given package
-- it takes[0] less than 10s to sha1sum all SOURCES of openoffice.org-3.1-1mdv2010.0.src.rpm
-- it probably takes way less than the time to upload the file into the repository
-- it can be computed in parallel to the binrepo commit, and probably finish
- before that, thus ready by the time `sha1.lst` should be commited
-- users don't need to verify the SHA1s "everytime", but the build system
- does, thus Repsys can default to not verify and avoid wasting users' time
-
-The use of `sha1.lst` has the valuable property of tying the state of the main
-repository and the binrepo. With it, at getsrpm time of a package
-submission we can verify the SHA1 of the SOURCES-bin, and be sure that
-either the package will be built with the expected state, or early fail the
-build. It also allows for verifying binaries without trusting the binrepo,
-which may be useful if we consider using an unversioned plain filesystem
-storage in the future (for old distros or whatever), or at "client side",
-which maintainers may find useful.
-
-[0]: In a single core AMD Athlon(tm) 3800+ (2400Mhz)
-
-Mapping of revisions using SVN properties
------------------------------------------
-
-Alternatively to using the above "sha1.lst scheme", the revision mapping
-between the main repository and a binrepo could be done using subversion
-properties. This could be done by making every commit to binrepos also
-cause a corresponding commit in the main text repository to happen, which
-would update a property recording the current date. That is, a subversion
-property in the main text repository would be kept, such that for any given
-main repository revision, the corresponding state of the binrepos is
-obtainable (using the registered date).
-
-This would be "more transparent", as it can be maintened simply by using
-subversion hooks, without user intervention. OTOH, as every time the user
-commits to a binrepo this would result in a commit in the main repository,
-it would require the user to "svn up" the directories from there before
-commiting, after every binrepo commit. Also, this might result in a big
-number of "bogus" commits to the main repository, which could be seen as log
-pollution, and may potentially increase space usage etc..
-
-Why a new repository without the tarballs
-==========================================
-
-- the current svn repository is too large, hard to manage
-- big binary files (in general, "tarballs") history is of little value in
- the distro development, we care much more about our specs, patches,
- configurations, etc.; nonetheless, those big files we don't care much for
- take the most resources and make backups and restoration in case of
- failure very expensive, much more so than the more valuable data
-- there is no easy way to strip undesired tarballs without recreating the
- whole repository
-- fedora and ubuntu have separated repositories, so we must have it too!
-
-Numbers
--------
-
-Current repository is +390000 revisions and ~340Gb big, while the bzip2ed
-dumps backup for it takes about a bit more than half that size (FIXME:
-estimative, can't check in the backup server right now). Current txtrepo
-with the same number of revisions is ~180Gb big, takes about 2-3 days to be
-imported, while the gzipped full dump backup for it currently takes ~1.2Gb.
-Initial binrepo for Cooker (only `current/` packages' branches) took ~28Gb
-in disk, gzipped full dump for it takes ~25Gb, took about 5h30m to be
-populated from the current in use repository ("oldrepo").
-
-
-Drawbacks of this layout
-=========================
-
-- (always) everything that changes the single-repository usage increases the chance
- of failure and make things more complicated.
-- subversion can't be used alone as easily as the current scheme allows
-- copying binaries between distro branches may not be "svn-cheap" anymore
- (unless they're in the same binrepo)
-- ...
-
-
-Open issues
-============
-
-Multiple binrepos dont allow us to have one permanent URL
----------------------------------------------------------
-
-We would have to update the configuration files from all the users in order
-to add a new stable repository. spuk suggests to use properties in the main
-text repo that would point to the right repository locations.
-
-How to handle failures when operating on more repositores?
-----------------------------------------------------------
-
-binrepos should replicate the structure of the main text repo. What we
-should do if the markrelease succeeds in the binrepo, but fails in the main
-text repo?
-
-R: Markrelease must be done first in the txtrepo. If it fails there "we're
-in trouble" (though currently, we just miss it[0]). When the markrelease is
-done in the txtrepo, we can do markrelease in the binrepo using '-r {DATE}',
-using the markrelease date in the txtrepo as '{DATE}'.
-
-[0] We should add transaction support for markrelease. The transaction could
-be stored out of the packages SVN (another SVN, a DB, a txt file, etc.), and
-would work like:
-
-0. mark beginning of markrelease, early failing the package build if it fails
-1. do markrelease
-2. mark sucessful end of markrelease
- or mark failed markrelease, so we can replay it later
-
-
-Interesting use cases (first phase)
-===================================
-
-repsys co 2008.1/mutt
----------------------
-
-- repsys checkouts
- http://svn.mandriva.com/svn/packages/updates/2008.1/mutt/current to the
- mutt directory
-
-- repsys checkouts
- http://svn.mandriva.com/svn/binrepo/updates/2008.1/mutt/current/SOURCES
- into mutt/SOURCES-bin
-
-- creates symlinks for all files found in SOURCES-bin/ into ../SOURCES/
-
- (rpm doesn't handle symlinks, this allows us to have explicit links and
- proper src.rpm generates by rpmbuild)
-
-In case the path doesn't exist in the binrepo it will not fail, as we may
-have not imported all packages or the repository is not prepared to work on
-this model, etc.
-
-markrelease of a package
-------------------------
-
-::
-
- $ repsys markrelease
-
-- will copy current/ to releases/VERSION/RELEASE, as usual
-
-- will copy current/ to releases/, on the binrepo too
-
-Optionally, markrelease could create revprops indicating which is the
-revision of current/ on the binrepo that represents the tarballs that are
-being tagged.
-
-
-Use cases to be implemented after the first phase
-=================================================
-
-upgrading to a newer version of the package
--------------------------------------------
-
-::
-
- $ cd bla/SOURCES/
- $ wget http://prdownloads.sourceforge.net/bla/bla-1.6.tar.bz2
- $ repsys add bla-1.6.0.tar.bz2
-
-- repsys notices this is a tarball (checking filename and/or file size)
-
-- repsys will move the file to SOURCES-bin/, create the symlink, and svn-add
- it to the working copy
-
- $ # the user updates the spec
-
- $ repsys rm SOURCES/bla-1.5.1.tar.bz2
-
-- it will remove the symlink and run svn rm on
- SOURCES-bin/bla-1.6.0.tar.bz2::
-
- $ cd ../ # package top dir
- $ repsys ci
-
-- repsys will commit the new tarball on SOURCES-bin/ and then on the rest
- of the working copy
-
-repsys sync would perform these steps too.
-
-importing a package
--------------------
-
- $ repsys putsrpm mypkg.src.rpm
-
-- repsys will open the src.rpm
-
-- will look for tarballs inside SOURCES/ and import them to
- http://svn.mandriva.com/svn/binrepo/cooker/mypkg/current/SOURCES/
-
-- will move the tarballs out of SOURCES and import the remaining files to
- http://svn.mandriva.com/svn/packages/cooker/mypkg/current/
-
-- will do whatever else putsrpm already does
-
-TODO
-=====
-
-First phase
------------
-
-- upload
-- markrelease
-- putsrpm
-- getsrpm
-
-
-Second phase
-------------
-
-- up
-- sync
-
-Rejected or postponed ideas
-===========================
-
-Use of a plain filesystem storage for the tarballs
---------------------------------------------------
-
-This was planned, then rejected. It becomes too complicated when thinking
-about markrelease, and mapping SVN revisions in the main repository to
-binaries versions in the "tarballs storage", basically requiring
-implementing VCS-like features on top of filesystem. Would also require
-implementing another authentication and access scheme. The main feature
-would be ease of removing old binaries, which isn't much of a point because
-we don't know precisely what and when we want to remove, so may end up not
-removing much files anyway.
-
-Use of a plain unversioned filesystem storage for the tarballs
---------------------------------------------------------------
-
-Different than the previous one, this would mean not relying at all on
-binary files history keeping. Structure could be something simple like::
-
- packages/${pkg:0:1}/$pkg/$tarball
-
-This alternative does not suffice for Cooker, nor for supported distros, for
-which we want history. It could, however, at some point be used for "very
-old" distros, for which we may have lost interest in keeping *binaries*
-history (package history will kept "forever" in the main SVN repository).
-Alternatively, "resetting" an SVN binrepo (i.e. recreate the repository) to
-contain only the latest tarballs would probably take about the same amount
-of space, anyway...
-
-Open tarballs repository
-------------------------
-
-This idea is not really rejected. It does not go against splitting txtrepo
-and binrepo, but rather complement this idea, where the
-open-tarballs-repository would take the place of the binrepo. The txtrepo
-would still be used +- the same way. This repository could be used
-selectively, for packages where it makes sense, while most packages could be
-kept "closed", still as tarballs.
-
-Use of externals for more seamless Subversion usage
----------------------------------------------------
-
-This idea is not discarded, but it just provides easiness. OTOH, it makes
-things more complicated:
-
-- markrelease: externals would have to be updated in order to make it point
- to the tagged version in the binrepo, otherwise changes in
- current at binrepo would change older releases;
-- branching whole distro: even though subversion now supports "relative
- externals", we would have to update the URLs for *every* package on the
- distro, as the path to reach the binrepo spans the local distribution
- directory;
-- keeping externals up-to-date (as stated above and below)
-- authentication and access control: only markrelease action done by the
- build system should be allowed to change externals (so what about importing
- new packages?)
-- just a convenience, we don't need and shouldn't rely on externals for
- running the build system, while most people will use the repositories via
- Repsys, so why spend time to implement and keep it?
-- "svn co" works transparently, cool, but "svn co -r N" does not, otherwise
- every change in the binrepo would require svn:externals to be updated in
- the respective package;
-- it does not solve the problem of creating and handling symlinks between
- SOURCES and SOURCES-bin.
-
-Keeping svn:externals updated for every package has almost the same cost of
-keeping the `sha1.lst` updated, with the difference that in the latter we
-would not have to update every package when creating distro branches.
-
-Use of "external" xdelta to save space on binaries
---------------------------------------------------
-
-But how? First idea is this could be done by defining a protocol and
-assuming repository manipulation with repsys (for ease). Repsys could
-xdelta tarballs and add it to SVN with a special filename, then use it when
-checking out. Would require a policy/algorithm on when to ditch old whole
-binaries, too (i.e. hopefully wouldn't need to be handled manually by the
-maintainer). Also, this is something complemental to splitting the
-repository, so we may do it later, for binrepos.
-
-
-The Future
-==========
-
-- Open tarballs repositories
-
- - suited for GIT, maybe multi-VCS
- - incremental move
- - not everything will be suited for this, must handle all cases or be
- optional
-
-- Xdelta
-
-
-Deployment
-==========
-
-The current repository will be kept around for a while, in readonly state.
-Initial binrepos will be populated with the binaries in the `current/`
-branches of packages.
-
-The binrepo mappings config might be kept in a fixed subversion revision
-property (revision 0?).
-
-Rough steps
------------
-
-- check for agreement between subversion repository filters for binaries,
- and repsys
-- upgrade repsys everywhere
-
- - kenobi
- - cluster nodes
- - raoh
- - titan
-
-- populate the binrepos for each supported distro, from a specific revision
- of oldrepo, and mass commmit the corresponding `sha1.lst` in txtrepo for
- every package
-
- - set svn:date revprop of the `sha1.lst` mass commit to the date of the
- oldrepo revision
- - before mass commiting the `sha1.lst`, possibly freeze oldrepo, check
- for changes to sources after the selected revision, and update the
- binrepo as necessary
-
-- check Secteam scripts, make needed changes to get them ready (non
- critical)
-- set up the new repositories
-
- - hook for filtering of disallowed (binary) files in main repository
- - binrepos mappings
-
-- make the new main + binrepos repositories available, but readonly
-
- - keep new main repository in sync with the old repository with hooks
-
-- make current repository readonly and enable verification of sha1.lst at
- package submission time
-
-- make sure new main repository and old repository are in sync
-
- - resync binrepos with the old repository as needed
-
-- final tests
-
- - change something
- - submit
- - etc.
-
-- make the new repositories writeable
-
Modified: build_system/mgarepo/trunk/MANIFEST.in
===================================================================
--- build_system/mgarepo/trunk/MANIFEST.in 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MANIFEST.in 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,10 +1,10 @@
-recursive-include RepSys *.py
-include RepSys/plugins/*.txt
-include repsys repsys.conf MANIFEST.in
-include repsys.8
+recursive-include MgaRepo *.py
+include MgaRepo/plugins/*.txt
+include mgarepo mgarepo.conf MANIFEST.in
+include mgarepo.8
include README
include CHANGES
include README.LDAP
-include repsys-example.conf
+include mgarepo-example.conf
include *.chlog
-include create-srpm repsys-ssh
+include create-srpm mgarepo-ssh
Modified: build_system/mgarepo/trunk/MgaRepo/ConfigParser.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/ConfigParser.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/ConfigParser.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -350,12 +350,12 @@
self._config = ConfigParser()
self._wrapped = {}
conffiles = []
- repsys_conf = os.environ.get("REPSYS_CONF")
- if repsys_conf:
- conffiles.append(repsys_conf)
+ mgarepo_conf = os.environ.get("MGAREPO_CONF")
+ if mgarepo_conf:
+ conffiles.append(mgarepo_conf)
else:
- conffiles.append("/etc/repsys.conf")
- conffiles.append(os.path.expanduser("~/.repsys/config"))
+ conffiles.append("/etc/mgarepo.conf")
+ conffiles.append(os.path.expanduser("~/.mgarepo/config"))
for file in conffiles:
if os.path.isfile(file):
self._config.read(file)
Modified: build_system/mgarepo/trunk/MgaRepo/binrepo.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/binrepo.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,6 +1,6 @@
-from RepSys import Error, config, mirror, layout
-from RepSys.util import execcmd, rellink
-from RepSys.svn import SVN
+from MgaRepo import Error, config, mirror, layout
+from MgaRepo.util import execcmd, rellink
+from MgaRepo.svn import SVN
import sys
import os
@@ -302,7 +302,7 @@
return t
def upload(path, message=None):
- from RepSys.rpmutil import getpkgtopdir
+ from MgaRepo.rpmutil import getpkgtopdir
svn = SVN()
if not os.path.exists(path):
raise Error, "not found: %s" % path
Modified: build_system/mgarepo/trunk/MgaRepo/cgi/soapserver.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/cgi/soapserver.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/cgi/soapserver.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,7 +1,7 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
import sys
import os
Modified: build_system/mgarepo/trunk/MgaRepo/cgi/submit.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/cgi/submit.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/cgi/submit.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,7 +1,7 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
import cgi
import sys
import os
Modified: build_system/mgarepo/trunk/MgaRepo/cgi/xmlrpcserver.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/cgi/xmlrpcserver.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/cgi/xmlrpcserver.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,7 +1,7 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import CgiError, get_targets
+from MgaRepo import Error, config
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import CgiError, get_targets
import sys
import os
Modified: build_system/mgarepo/trunk/MgaRepo/cgiutil.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/cgiutil.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/cgiutil.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,7 +1,7 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys.svn import SVN
-from RepSys.ConfigParser import NoSectionError
+from MgaRepo import Error, config
+from MgaRepo.svn import SVN
+from MgaRepo.ConfigParser import NoSectionError
import time
import re
Modified: build_system/mgarepo/trunk/MgaRepo/command.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/command.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/command.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,5 +1,5 @@
#!/usr/bin/python
-from RepSys import SilentError, Error, config
+from MgaRepo import SilentError, Error, config
import sys, os
import urlparse
import optparse
Modified: build_system/mgarepo/trunk/MgaRepo/commands/authoremail.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/authoremail.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/authoremail.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,20 +1,20 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys.command import *
+from MgaRepo import Error, config
+from MgaRepo.command import *
import sys
import getopt
HELP = """\
-Usage: repsys authoremail [OPTIONS] AUTHOR
+Usage: mgarepo authoremail [OPTIONS] AUTHOR
Shows the e-mail of an SVN author. It is just a simple interface to access
-the [authors] section of repsys.conf.
+the [authors] section of mgarepo.conf.
Options:
-h Show this message
Examples:
- repsys authoremail john
+ mgarepo authoremail john
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/changed.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/changed.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/changed.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,13 +1,13 @@
#!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import check_changed
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import check_changed
import getopt
import sys
HELP = """\
-Usage: repsys changed [OPTIONS] URL
+Usage: mgarepo changed [OPTIONS] URL
Shows if there are pending changes since the last package release.
@@ -18,8 +18,8 @@
-h Show this message
Examples:
- repsys changed http://repos/svn/cnc/snapshot/foo
- repsys changed -a http://repos/svn/cnc/snapshot
+ mgarepo changed http://repos/svn/cnc/snapshot/foo
+ mgarepo changed -a http://repos/svn/cnc/snapshot
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/ci.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/ci.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/ci.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,15 +1,15 @@
#!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import commit
+from MgaRepo.command import *
+from MgaRepo.rpmutil import commit
HELP = """\
-Usage: repsys ci [TARGET]
+Usage: mgarepo ci [TARGET]
Will commit recent modifications in the package.
-The difference between an ordinary "svn ci" and "repsys ci" is that it
+The difference between an ordinary "svn ci" and "mgarepo ci" is that it
relocates the working copy to the default repository in case the option
-"mirror" is set in repsys.conf.
+"mirror" is set in mgarepo.conf.
Options:
-h Show this message
@@ -17,8 +17,8 @@
-F FILE Read log message from FILE
Examples:
- repsys ci
- repsys ci SPECS/package.spec SPECS/package-patch.patch
+ mgarepo ci
+ mgarepo ci SPECS/package.spec SPECS/package-patch.patch
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/co.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/co.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/co.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,14 +1,14 @@
#!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.rpmutil import checkout
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.rpmutil import checkout
import getopt
import sys
HELP = """\
-Usage: repsys co [OPTIONS] URL [LOCALPATH]
+Usage: mgarepo co [OPTIONS] URL [LOCALPATH]
-Checkout the package source from the Mandriva repository.
+Checkout the package source from the Mageia repository.
If the 'mirror' option is enabled, the package is obtained from the mirror
repository.
@@ -27,11 +27,11 @@
-h Show this message
Examples:
- repsys co pkgname
- repsys co -d 2009.0 pkgname
- repsys co 2009.0/pkgame
- repsys co http://repos/svn/cnc/snapshot/foo
- repsys co http://repos/svn/cnc/snapshot/foo foo-pkg
+ mgarepo co pkgname
+ mgarepo co -d 2009.0 pkgname
+ mgarepo co 2009.0/pkgame
+ mgarepo co http://repos/svn/cnc/snapshot/foo
+ mgarepo co http://repos/svn/cnc/snapshot/foo foo-pkg
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/create.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/create.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/create.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,13 +1,13 @@
#!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import create_package
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import create_package
import getopt
import sys
HELP = """\
-Usage: repsys create [OPTIONS] URL
+Usage: mgarepo create [OPTIONS] URL
Creates the minimal structure of a package in the repository.
@@ -15,8 +15,8 @@
-h Show this message
Examples:
- repsys create newpkg
- repsys create svn+ssh://svn.mandriva.com/svn/packages/cooker/newpkg
+ mgarepo create newpkg
+ mgarepo create svn+ssh://svn.mageia.org/svn/packages/cauldron/newpkg
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/del.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/del.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/del.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import binrepo_delete
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import binrepo_delete
HELP = """\
-Usage: repsys del [OPTIONS] [PATH]
+Usage: mgarepo del [OPTIONS] [PATH]
Remove a given file from the binary sources repository.
Modified: build_system/mgarepo/trunk/MgaRepo/commands/editlog.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/editlog.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/editlog.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,19 +1,19 @@
#!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.svn import SVN
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.svn import SVN
import re
HELP = """\
-Usage: repsys editlog [OPTIONS] [URL] REVISION
+Usage: mgarepo editlog [OPTIONS] [URL] REVISION
Options:
-h Show this message
Examples:
- repsys editlog 14800
- repsys editlog https://repos/svn/cnc/snapshot 14800
+ mgarepo editlog 14800
+ mgarepo editlog https://repos/svn/cnc/snapshot 14800
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/getspec.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/getspec.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/getspec.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,13 +1,13 @@
#!/usr/bin/python
-from RepSys import Error, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import get_spec
+from MgaRepo import Error, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import get_spec
import getopt
import sys
HELP = """\
-Usage: repsys getspec [OPTIONS] REPPKGURL
+Usage: mgarepo getspec [OPTIONS] REPPKGURL
Prints the .spec file of a given package.
@@ -17,8 +17,8 @@
-h Show this message
Examples:
- repsys getspec pkgname
- repsys getspec svn+ssh://svn.mandriva.com/svn/packages/cooker/pkgname
+ mgarepo getspec pkgname
+ mgarepo getspec svn+ssh://svn.mageia.org/svn/packages/cauldron/pkgname
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/getsrpm.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/getsrpm.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/getsrpm.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -3,10 +3,10 @@
# This program will extract given version/revision of the named package
# from the Conectiva Linux repository system.
#
-from RepSys import Error, config, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import get_srpm
+from MgaRepo import Error, config, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import get_srpm
import tempfile
import shutil
import getopt
@@ -15,7 +15,7 @@
import os
HELP = """\
-Usage: repsys getsrpm [OPTIONS] REPPKGURL
+Usage: mgarepo getsrpm [OPTIONS] REPPKGURL
Generates the source RPM (.srpm) file of a given package.
@@ -37,11 +37,11 @@
--strict Check if the given revision contains changes in REPPKGURL
Examples:
- repsys getsrpm python
- repsys getsrpm -l python
- repsys getsrpm http://foo.bar/svn/cnc/snapshot/python
- repsys getsrpm -p http://foo.bar/svn/cnc/releases/8cl/python
- repsys getsrpm -r 1001 file:///svn/cnc/snapshot/python
+ mgarepo getsrpm python
+ mgarepo getsrpm -l python
+ mgarepo getsrpm http://foo.bar/svn/cnc/snapshot/python
+ mgarepo getsrpm -p http://foo.bar/svn/cnc/releases/8cl/python
+ mgarepo getsrpm -r 1001 file:///svn/cnc/snapshot/python
"""
def mode_callback(option, opt, val, parser, mode):
Modified: build_system/mgarepo/trunk/MgaRepo/commands/log.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/log.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/log.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,14 +1,14 @@
#!/usr/bin/python
-from RepSys import config, mirror, disable_mirror
-from RepSys.command import *
-from RepSys.layout import package_url, checkout_url
-from RepSys.rpmutil import sync
-from RepSys.util import execcmd
+from MgaRepo import config, mirror, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.layout import package_url, checkout_url
+from MgaRepo.rpmutil import sync
+from MgaRepo.util import execcmd
import sys
import os
HELP = """\
-Usage: repsys log [OPTIONS] [PACKAGE]
+Usage: mgarepo log [OPTIONS] [PACKAGE]
Shows the SVN log for a given package.
@@ -20,8 +20,8 @@
-M Do not use the mirror (use the main repository)
Examples:
- repsys log mutt
- repsys log 2009.1/mutt
+ mgarepo log mutt
+ mgarepo log 2009.1/mutt
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/markrelease.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/markrelease.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/markrelease.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -7,12 +7,12 @@
# directory and etc). Also, notice that packages must be included in
# cronological order.
#
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.simplerpm import SRPM
-from RepSys.rpmutil import mark_release
-from RepSys.util import get_auth
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.simplerpm import SRPM
+from MgaRepo.rpmutil import mark_release
+from MgaRepo.util import get_auth
import getopt
import sys
import os
@@ -20,7 +20,7 @@
HELP = """\
*** WARNING --- You probably SHOULD NOT use this program! --- WARNING ***
-Usage: repsys markrelease [OPTIONS] REPPKGURL
+Usage: mgarepo markrelease [OPTIONS] REPPKGURL
This subcommand creates a 'tag' for a given revision of a given package.
@@ -35,9 +35,9 @@
-h Show this message
Examples:
- repsys markrelease -r 68 -v 1.0-1 file://svn/cnc/snapshot/foo
- repsys markrelease -f @68:foo-1.0-1.src.rpm file://svn/cnc/snapshot/foo
- repsys markrelease -r 68 -f foo-1.0.src.rpm file://svn/cnc/snapshot/foo
+ mgarepo markrelease -r 68 -v 1.0-1 file://svn/cnc/snapshot/foo
+ mgarepo markrelease -f @68:foo-1.0-1.src.rpm file://svn/cnc/snapshot/foo
+ mgarepo markrelease -r 68 -f foo-1.0.src.rpm file://svn/cnc/snapshot/foo
"""
def version_callback(option, opt, val, parser):
Modified: build_system/mgarepo/trunk/MgaRepo/commands/patchspec.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/patchspec.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/patchspec.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -2,15 +2,15 @@
#
# This program will try to patch a spec file from a given package url.
#
-from RepSys import Error
-from RepSys.rpmutil import patch_spec
-from RepSys.command import *
-from RepSys.layout import package_url
+from MgaRepo import Error
+from MgaRepo.rpmutil import patch_spec
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
import getopt
import sys
HELP = """\
-Usage: repsys patchspec [OPTIONS] REPPKGURL PATCHFILE
+Usage: mgarepo patchspec [OPTIONS] REPPKGURL PATCHFILE
It will try to patch a spec file from a given package url.
@@ -19,7 +19,7 @@
-h Show this message
Examples:
- repsys patchspec http://repos/svn/cnc/snapshot/foo
+ mgarepo patchspec http://repos/svn/cnc/snapshot/foo
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/putsrpm.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,13 +1,13 @@
#!/usr/bin/python
-from RepSys import Error
-from RepSys.command import *
-from RepSys.layout import package_url
-from RepSys.rpmutil import put_srpm
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.layout import package_url
+from MgaRepo.rpmutil import put_srpm
import getopt
import sys, os
HELP = """\
-Usage: repsys putsrpm [OPTIONS] SOURCERPMS
+Usage: mgarepo putsrpm [OPTIONS] SOURCERPMS
Will import source RPMs into the SVN repository.
@@ -27,8 +27,8 @@
-h Show this message
Examples:
- repsys putsrpm pkg/SRPMS/pkg-2.0-1.src.rpm
- repsys putsrpm -b 2009.1 foo-1.1-1.src.rpm
+ mgarepo putsrpm pkg/SRPMS/pkg-2.0-1.src.rpm
+ mgarepo putsrpm -b 2009.1 foo-1.1-1.src.rpm
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/rpmlog.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/rpmlog.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/rpmlog.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -3,17 +3,17 @@
# This program will convert the output of "svn log" to be suitable
# for usage in an rpm %changelog session.
#
-from RepSys import Error, layout, disable_mirror
-from RepSys.command import *
-from RepSys.svn import SVN
-from RepSys.log import get_changelog, split_spec_changelog
+from MgaRepo import Error, layout, disable_mirror
+from MgaRepo.command import *
+from MgaRepo.svn import SVN
+from MgaRepo.log import get_changelog, split_spec_changelog
from cStringIO import StringIO
import getopt
import os
import sys
HELP = """\
-Usage: repsys rpmlog [OPTIONS] REPPKGDIRURL
+Usage: mgarepo rpmlog [OPTIONS] REPPKGDIRURL
Prints the RPM changelog of a given package.
@@ -28,8 +28,8 @@
-h Show this message
Examples:
- repsys rpmlog python
- repsys rpmlog http://svn.mandriva.com/svn/packages/cooker/python
+ mgarepo rpmlog python
+ mgarepo rpmlog http://svn.mandriva.com/svn/packages/cooker/python
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/submit.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/submit.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/submit.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,9 +1,9 @@
#!/usr/bin/python
-from RepSys import Error, config, layout, mirror
-from RepSys.svn import SVN
-from RepSys.command import *
-from RepSys.rpmutil import get_spec, get_submit_info
-from RepSys.util import get_auth, execcmd, get_helper
+from MgaRepo import Error, config, layout, mirror
+from MgaRepo.svn import SVN
+from MgaRepo.command import *
+from MgaRepo.rpmutil import get_spec, get_submit_info
+from MgaRepo.util import get_auth, execcmd, get_helper
import urllib
import getopt
import sys
@@ -14,7 +14,7 @@
import xmlrpclib
HELP = """\
-Usage: repsys submit [OPTIONS] [URL[@REVISION] ...]
+Usage: mgarepo submit [OPTIONS] [URL[@REVISION] ...]
Submits the package from URL to the submit host.
@@ -47,14 +47,14 @@
in the submit host
Examples:
- repsys submit
- repsys submit foo
- repsys submit 2009.1/foo
- repsys submit foo at 14800 bar baz at 11001
- repsys submit https://repos/svn/mdv/cooker/foo
- repsys submit -l https://repos
- repsys submit 2008.1/my-packages at 11011
- repsys submit --define section=main/testing -t 2008.1
+ mgarepo submit
+ mgarepo submit foo
+ mgarepo submit 1/foo
+ mgarepo submit foo at 14800 bar baz at 11001
+ mgarepo submit https://repos/svn/mga/cauldron/foo
+ mgarepo submit -l https://repos
+ mgarepo submit 1/my-packages at 11011
+ mgarepo submit --define section=core/testing -t 1
"""
DEFAULT_TARGET = "Cooker"
@@ -157,7 +157,7 @@
def list_targets(option, opt, val, parser):
host = config.get("submit", "host")
if host is None:
- raise Error, "no submit host defined in repsys.conf"
+ raise Error, "no submit host defined in mgarepo.conf"
createsrpm = get_helper("create-srpm")
#TODO make it configurable
command = "ssh %s %s --list" % (host, createsrpm)
@@ -186,7 +186,7 @@
baseargs.append(entry)
cmdsargs = []
if len(urls) == 1:
- # be compatible with server-side repsys versions older than 1.6.90
+ # be compatible with server-side mgarepo versions older than 1.6.90
url, rev = layout.split_url_revision(urls[0])
baseargs.append("-r")
baseargs.append(str(rev))
Modified: build_system/mgarepo/trunk/MgaRepo/commands/switch.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/switch.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/switch.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,16 +1,16 @@
#!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import switch
+from MgaRepo.command import *
+from MgaRepo.rpmutil import switch
HELP = """\
-Usage: repsys switch [URL]
+Usage: mgarepo switch [URL]
Relocates the working copy to the base location URL.
-If URL is not provided, it will use the option repository from repsys.conf
+If URL is not provided, it will use the option repository from mgarepo.conf
as default, or, if the current working copy is already based in
default_parent, it will use the location from the mirror option from
-repsys.conf.
+mgarepo.conf.
If the current work is based in another URL, it will use default_parent.
@@ -18,8 +18,8 @@
-h Show this message
Examples:
- repsys switch
- repsys switch https://mirrors.localnetwork/svn/packages/
+ mgarepo switch
+ mgarepo switch https://mirrors.localnetwork/svn/packages/
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/sync.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/sync.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/sync.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,9 +1,9 @@
#!/usr/bin/python
-from RepSys.command import *
-from RepSys.rpmutil import sync
+from MgaRepo.command import *
+from MgaRepo.rpmutil import sync
HELP = """\
-Usage: repsys sync
+Usage: mgarepo sync
Will add or remove from the working copy those files added or removed
in the spec file.
@@ -18,7 +18,7 @@
-h Show this message
Examples:
- repsys sync
+ mgarepo sync
"""
def parse_options():
Modified: build_system/mgarepo/trunk/MgaRepo/commands/up.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/up.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/up.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import update
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import update
HELP = """\
-Usage: repsys up [PATH]
+Usage: mgarepo up [PATH]
Update the package working copy and synchronize all binaries.
Modified: build_system/mgarepo/trunk/MgaRepo/commands/upload.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/commands/upload.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/commands/upload.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,9 +1,9 @@
-from RepSys import Error
-from RepSys.command import *
-from RepSys.rpmutil import upload
+from MgaRepo import Error
+from MgaRepo.command import *
+from MgaRepo.rpmutil import upload
HELP = """\
-Usage: repsys upload [OPTIONS] [PATH]
+Usage: mgarepo upload [OPTIONS] [PATH]
Upload a given file to the binary sources repository.
Modified: build_system/mgarepo/trunk/MgaRepo/layout.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/layout.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/layout.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -3,13 +3,13 @@
import os
import urlparse
-from RepSys import Error, config
-from RepSys.svn import SVN
+from MgaRepo import Error, config
+from MgaRepo.svn import SVN
__all__ = ["package_url", "checkout_url", "repository_url", "get_url_revision"]
def layout_dirs():
- devel_branch = config.get("global", "trunk-dir", "cooker/")
+ devel_branch = config.get("global", "trunk-dir", "cauldron/")
devel_branch = os.path.normpath(devel_branch)
branches_dir = config.get("global", "branches-dir", "updates/")
branches_dir = os.path.normpath(branches_dir)
@@ -96,7 +96,7 @@
return newurl
def convert_default_parent(url):
- """Removes the cooker/ component from the URL"""
+ """Removes the cauldron/ component from the URL"""
parsed = list(urlparse.urlparse(url))
path = os.path.normpath(parsed[2])
rest, last = os.path.split(path)
@@ -126,7 +126,7 @@
default_parent = config.get("global", "default_parent")
if default_parent is None:
raise Error, "you need to set the 'repository' " \
- "configuration option on repsys.conf"
+ "configuration option on mgarepo.conf"
url = convert_default_parent(default_parent)
return url
@@ -141,7 +141,7 @@
@distro: the name of the repository branch inside updates/
@mirrored: return an URL based on the mirror repository, if enabled
"""
- from RepSys import mirror
+ from MgaRepo import mirror
if "://" in name_or_url:
pkgdirurl = mirror.normalize_path(name_or_url)
pkgdirurl = remove_current(pkgdirurl)
@@ -156,7 +156,7 @@
if distro:
default_branch = os.path.join(default_branch, distro)
else:
- default_branch = devel_branch # cooker
+ default_branch = devel_branch # cauldron
path = os.path.join(default_branch, name)
parsed = list(urlparse.urlparse(repository_url(mirrored=mirrored)))
parsed[2] = os.path.join(parsed[2], path)
@@ -183,7 +183,7 @@
def distro_branch(pkgdirurl):
"""Tries to guess the distro branch name from a package URL"""
- from RepSys.mirror import same_base
+ from MgaRepo.mirror import same_base
found = None
repo = repository_url()
if same_base(repo, pkgdirurl):
Modified: build_system/mgarepo/trunk/MgaRepo/log.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/log.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/log.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,12 +1,12 @@
#!/usr/bin/python
-from RepSys import Error, config, layout
-from RepSys.svn import SVN
-from RepSys.util import execcmd
+from MgaRepo import Error, config, layout
+from MgaRepo.svn import SVN
+from MgaRepo.util import execcmd
try:
from Cheetah.Template import Template
except ImportError:
- raise Error, "repsys requires the package python-cheetah"
+ raise Error, "mgarepo requires the package python-cheetah"
from cStringIO import StringIO
@@ -71,7 +71,7 @@
Is here where things should be changed if "automatic release increasing"
will be used.
"""
- from RepSys.rpmutil import rpm_macros_defs
+ from MgaRepo.rpmutil import rpm_macros_defs
svn = SVN()
pkgcurrenturl = os.path.join(pkgdirurl, "current")
specurl = os.path.join(pkgcurrenturl, "SPECS")
@@ -325,7 +325,7 @@
def dump_file(releases, currentlog=None, template=None):
templpath = template or config.get("template", "path",
- "/usr/share/repsys/default.chlog")
+ "/usr/share/mgarepo/default.chlog")
params = {}
if templpath is None or not os.path.exists(templpath):
params["source"] = default_template
@@ -591,7 +591,7 @@
checkout of the package, so that the spec file can be
parsed from there
@oldlog: if set it will try to append the old changelog file defined
- in oldurl in repsys.conf
+ in oldurl in mgarepo.conf
"""
newlog = StringIO()
if svn:
Modified: build_system/mgarepo/trunk/MgaRepo/mirror.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/mirror.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/mirror.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -3,8 +3,8 @@
import urlparse
import urllib
-from RepSys import Error, config, layout
-from RepSys.svn import SVN
+from MgaRepo import Error, config, layout
+from MgaRepo.svn import SVN
def mirror_url():
mirror = config.get("global", "mirror")
@@ -71,7 +71,7 @@
stream.write("Using the svn mirror.\n")
if write:
stream.write("To be able to commit changes, use "
- "'repsys switch' first.\n")
+ "'mgarepo switch' first.\n")
def mirror_relocate(oldparent, newparent, url, wcpath):
svn = SVN()
@@ -99,13 +99,13 @@
repository = layout.repository_url()
current = repository
if repository is None:
- raise Error, "the option repository from repsys.conf is "\
+ raise Error, "the option repository from mgarepo.conf is "\
"required"
indefault = same_base(repository, wcurl)
if not newbaseurl:
if not mirror:
raise Error, "an URL is needed when the option mirror "\
- "from repsys.conf is not set"
+ "from mgarepo.conf is not set"
if indefault:
chosen = mirror
elif same_base(mirror, wcurl):
Modified: build_system/mgarepo/trunk/MgaRepo/plugins/__init__.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/plugins/__init__.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/plugins/__init__.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -8,19 +8,19 @@
for entry in os.listdir(pluginsdir):
if entry != "__init__.py" and entry.endswith(".py"):
name = entry[:-3]
- loaded[name] = __import__("RepSys.plugins."+name, {}, {},
+ loaded[name] = __import__("MgaRepo.plugins."+name, {}, {},
[name])
elif os.path.isdir(entry):
initfile = os.path.join(entry, "__init__.py")
if os.path.isfile(initfile):
- loaded[entry] = __import__("RepSys.plugins."+entry, {}, {},
+ loaded[entry] = __import__("MgaRepo.plugins."+entry, {}, {},
[entry])
def list():
return loaded.keys()
def help(name):
- from RepSys import Error
+ from MgaRepo import Error
try:
return loaded[name].__doc__
except KeyError:
Modified: build_system/mgarepo/trunk/MgaRepo/plugins/ldapusers.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/plugins/ldapusers.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/plugins/ldapusers.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,8 +1,8 @@
"""
-A Repsys plugin for obtaining users from a LDAP server.
+A mgarepo plugin for obtaining users from a LDAP server.
In order to enable the plugin, the user must define the following
-options in the [global] section of repsys.conf:
+options in the [global] section of mgarepo.conf:
ldap-uri [required if ldap-server is unset]
the URI of the server, you can refer to more than one server by
@@ -53,15 +53,15 @@
Note that only the first value of the attributes will be
used.
-When the searched option is not found, it will try in repsys.conf. All
-the values found. (including from repsys.conf) will be cached between
+When the searched option is not found, it will try in mgarepo.conf. All
+the values found. (including from mgarepo.conf) will be cached between
each configuration access.
This plugin requires the package python-ldap.
For more information, look http://qa.mandriva.com/show_bug.cgi?id=30549
"""
-from RepSys import Error, config
+from MgaRepo import Error, config
import string
Modified: build_system/mgarepo/trunk/MgaRepo/plugins/sample.py.txt
===================================================================
--- build_system/mgarepo/trunk/RepSys/plugins/sample.py.txt 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/plugins/sample.py.txt 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,6 +1,6 @@
-# Sample repsys plugin. In order to test it, rename to sample.py
+# Sample mgarepo plugin. In order to test it, rename to sample.py
# vim:ft=python
-from RepSys import config
+from MgaRepo import config
def users_wrapper(section, option=None, default=None, walk=False):
d = {"foolano": "Foolano De Tal <foolano at bla.com>",
Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/rpmutil.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,10 +1,10 @@
#!/usr/bin/python
-from RepSys import Error, config
-from RepSys import mirror, layout, log, binrepo
-from RepSys.svn import SVN
-from RepSys.simplerpm import SRPM
-from RepSys.util import execcmd
-from RepSys.command import default_parent
+from MgaRepo import Error, config
+from MgaRepo import mirror, layout, log, binrepo
+from MgaRepo.svn import SVN
+from MgaRepo.simplerpm import SRPM
+from MgaRepo.util import execcmd
+from MgaRepo.command import default_parent
import rpm
import urlparse
import tempfile
@@ -630,7 +630,7 @@
mopts = " ".join(opts)
os.system("svn ci %s %s" % (mopts, target))
if mirrored:
- print "use \"repsys switch\" in order to switch back to mirror "\
+ print "use \"mgarepo switch\" in order to switch back to mirror "\
"later"
def spec_sources(topdir):
Modified: build_system/mgarepo/trunk/MgaRepo/simplerpm.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/simplerpm.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/simplerpm.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,5 +1,5 @@
#!/usr/bin/python
-from RepSys.util import execcmd
+from MgaRepo.util import execcmd
class SRPM:
def __init__(self, filename):
Modified: build_system/mgarepo/trunk/MgaRepo/svn.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/svn.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/svn.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,5 +1,5 @@
-from RepSys import Error, SilentError, config
-from RepSys.util import execcmd, get_auth
+from MgaRepo import Error, SilentError, config
+from MgaRepo.util import execcmd, get_auth
import sys
import os
import re
@@ -43,7 +43,7 @@
"http://wiki.mandriva.com/en/Development/Docs/Contributor_Tricks#SSH_configuration"
" for more information.")
elif "authorization failed" in e.args[0]:
- msg = ("Note that repsys does not support any HTTP "
+ msg = ("Note that mgarepo does not support any HTTP "
"authenticated access.")
if kwargs.get("show") and \
not config.getbool("global", "verbose", 0):
@@ -59,8 +59,8 @@
raise
def _set_env(self):
- wrapper = "repsys-ssh"
- repsys = config.get("global", "repsys-cmd")
+ wrapper = "mgarepo-ssh"
+ repsys = config.get("global", "mgarepo-cmd")
if repsys:
dir = os.path.dirname(repsys)
path = os.path.join(dir, wrapper)
Modified: build_system/mgarepo/trunk/MgaRepo/util.py
===================================================================
--- build_system/mgarepo/trunk/RepSys/util.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/MgaRepo/util.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,6 +1,6 @@
#!/usr/bin/python
-from RepSys import Error, config
+from MgaRepo import Error, config
import subprocess
import getpass
@@ -11,7 +11,7 @@
from cStringIO import StringIO
#import commands
-log = logging.getLogger("repsys")
+log = logging.getLogger("mgarepo")
# Our own version of commands' getstatusoutput(). We have a commands
# module directory, so we can't import Python's standard module
@@ -85,7 +85,7 @@
def mapurl(url):
"""Maps a url following the regexp provided by the option url-map in
- repsys.conf
+ mgarepo.conf
"""
urlmap = config.get("global", "url-map")
newurl = url
@@ -109,7 +109,7 @@
configuration, if not, falls back to the default helper path, which can
also be defined in configuration file(s).
"""
- helperdir = config.get("helper", "prefix", "/usr/share/repsys")
+ helperdir = config.get("helper", "prefix", "/usr/share/mgarepo")
hpath = config.get("helper", name, None) or \
os.path.join(helperdir, name)
if not os.path.isfile(hpath):
Modified: build_system/mgarepo/trunk/README
===================================================================
--- build_system/mgarepo/trunk/README 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/README 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,12 +1,11 @@
-repsys is the tool used to manage RPM packages in a subversion repository.
+mgarepo is the tool used to manage RPM packages in a subversion repository
+on Mageia. It is a fork of the repsys tool used by Mandriva.
It is used to create, tag releases, generate .src.rpm, generate changelog,
and request new package releases for build. It mostly acts as a interface
to svn(1) commands and small task scripts run that on the build system side
over ssh(1).
-For more information, see repsys(8) and
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
+For more information, see mgarepo(8)
-The discussion on the development of repsys takes place on the
-"maintainers" mailing list:
-http://wiki.mandriva.com/en/Development/Mailinglists
+The discussion on the development of mageiarepo takes place on the
+Mageia developers mailing list.
Copied: build_system/mgarepo/trunk/README.BINREPO (from rev 264, build_system/mgarepo/trunk/BRANCH)
===================================================================
--- build_system/mgarepo/trunk/README.BINREPO (rev 0)
+++ build_system/mgarepo/trunk/README.BINREPO 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,360 @@
+================================
+The detached binaries repository
+================================
+
+.. contents::
+
+A brief description
+===================
+
+Ideally, all binaries from packages sources (ie. all the binary files inside
+SOURCES/) will be placed in another subversion repository. This repository
+is called "tarballs repository", "binaries repository" or just "binrepo".
+It will contain mostly the same directory structure of the main repository,
+but instead of having SOURCES and SPECS, it will only have a SOURCES
+directory. Every copy/move operation should happen in both repositories.
+
+In order to allow deceasing binaries from older distributions, each stable
+distro will have its own subversion repository for binary files. mgarepo
+knows how to access these binrepos by checking which URL defined in the
+"[binrepo]" section of the configuration file matches the path-part of the
+repository being accessed. (see open issues)
+
+The package changelogs will be generated from SVN commit logs in the main
+"plaintext" repository ("txtrepo" for short) only. Old changelogs will be
+preserved, as even empty revisions are preserved in the binaries-filtering
+conversion.
+
+
+Mapping repositories states
+---------------------------
+
+In order to allow the use of `mgarepo {getsrpm,co} -r REV`, mgarepo will have
+to use a reference in the text repo which will be used to know in what
+state was the binrepo when a binary was uploaded.
+
+We cannot use direct revision number mapping through properties/files/etc
+mainly because we may have multiple binaries repositories, and eventually
+they can be filtered for reducing space, thus can't ensure revisions will
+survive. Thus another mechanism which relies on dates instead of revisions
+numbers is needed.
+
+When a binary is uploaded to the binrepo, the file `sha1.lst` is updated to
+have the files's hash and commited in the main text repo. This file will be
+used as the reference when the user uses -r REV on mgarepo. mgarepo will
+checkout the package in the main text repo with -r REV and then will use
+the "Last Changed Date" of `sha1.lst` to checkout the binrepo part. Thus,
+`sha1.lst` should be always commited to the main text repository *after* the
+corresponding binary files have been commited to the binrepo. Hooks in the
+main repository may be used to try to enforce this, by checking if the files
+changed in `sha1.lst` are already commited in the corresponding binrepo.
+
+Computation of `sha1.lst` is unlikely to be an issue:
+
+- it should not happen too often for any given package
+- it takes[0] less than 10s to sha1sum all SOURCES of openoffice.org-3.1-1mdv2010.0.src.rpm
+- it probably takes way less than the time to upload the file into the repository
+- it can be computed in parallel to the binrepo commit, and probably finish
+ before that, thus ready by the time `sha1.lst` should be commited
+- users don't need to verify the SHA1s "everytime", but the build system
+ does, thus Repsys can default to not verify and avoid wasting users' time
+
+The use of `sha1.lst` has the valuable property of tying the state of the main
+repository and the binrepo. With it, at getsrpm time of a package
+submission we can verify the SHA1 of the SOURCES-bin, and be sure that
+either the package will be built with the expected state, or early fail the
+build. It also allows for verifying binaries without trusting the binrepo,
+which may be useful if we consider using an unversioned plain filesystem
+storage in the future (for old distros or whatever), or at "client side",
+which maintainers may find useful.
+
+[0]: In a single core AMD Athlon(tm) 3800+ (2400Mhz)
+
+Mapping of revisions using SVN properties
+-----------------------------------------
+
+Alternatively to using the above "sha1.lst scheme", the revision mapping
+between the main repository and a binrepo could be done using subversion
+properties. This could be done by making every commit to binrepos also
+cause a corresponding commit in the main text repository to happen, which
+would update a property recording the current date. That is, a subversion
+property in the main text repository would be kept, such that for any given
+main repository revision, the corresponding state of the binrepos is
+obtainable (using the registered date).
+
+This would be "more transparent", as it can be maintened simply by using
+subversion hooks, without user intervention. OTOH, as every time the user
+commits to a binrepo this would result in a commit in the main repository,
+it would require the user to "svn up" the directories from there before
+commiting, after every binrepo commit. Also, this might result in a big
+number of "bogus" commits to the main repository, which could be seen as log
+pollution, and may potentially increase space usage etc..
+
+Why a new repository without the tarballs
+==========================================
+
+- the current svn repository is too large, hard to manage
+- big binary files (in general, "tarballs") history is of little value in
+ the distro development, we care much more about our specs, patches,
+ configurations, etc.; nonetheless, those big files we don't care much for
+ take the most resources and make backups and restoration in case of
+ failure very expensive, much more so than the more valuable data
+- there is no easy way to strip undesired tarballs without recreating the
+ whole repository
+- fedora and ubuntu have separated repositories, so we must have it too!
+
+Numbers
+-------
+
+Current repository is +390000 revisions and ~340Gb big, while the bzip2ed
+dumps backup for it takes about a bit more than half that size (FIXME:
+estimative, can't check in the backup server right now). Current txtrepo
+with the same number of revisions is ~180Gb big, takes about 2-3 days to be
+imported, while the gzipped full dump backup for it currently takes ~1.2Gb.
+Initial binrepo for Cooker (only `current/` packages' branches) took ~28Gb
+in disk, gzipped full dump for it takes ~25Gb, took about 5h30m to be
+populated from the current in use repository ("oldrepo").
+
+
+Drawbacks of this layout
+=========================
+
+- (always) everything that changes the single-repository usage increases the chance
+ of failure and make things more complicated.
+- subversion can't be used alone as easily as the current scheme allows
+- copying binaries between distro branches may not be "svn-cheap" anymore
+ (unless they're in the same binrepo)
+- ...
+
+
+Open issues
+============
+
+Multiple binrepos dont allow us to have one permanent URL
+---------------------------------------------------------
+
+We would have to update the configuration files from all the users in order
+to add a new stable repository. spuk suggests to use properties in the main
+text repo that would point to the right repository locations.
+
+How to handle failures when operating on more repositores?
+----------------------------------------------------------
+
+binrepos should replicate the structure of the main text repo. What we
+should do if the markrelease succeeds in the binrepo, but fails in the main
+text repo?
+
+R: Markrelease must be done first in the txtrepo. If it fails there "we're
+in trouble" (though currently, we just miss it[0]). When the markrelease is
+done in the txtrepo, we can do markrelease in the binrepo using '-r {DATE}',
+using the markrelease date in the txtrepo as '{DATE}'.
+
+[0] We should add transaction support for markrelease. The transaction could
+be stored out of the packages SVN (another SVN, a DB, a txt file, etc.), and
+would work like:
+
+0. mark beginning of markrelease, early failing the package build if it fails
+1. do markrelease
+2. mark sucessful end of markrelease
+ or mark failed markrelease, so we can replay it later
+
+
+Interesting use cases (first phase)
+===================================
+
+mgarepo co 1/mutt
+---------------------
+
+- mgarepo checkouts
+ http://svn.mageia.org/svn/packages/updates/1/mutt/current to the
+ mutt directory
+
+- mgarepo checkouts
+ http://svn.mageia.org/svn/binrepo/updates/1/mutt/current/SOURCES
+ into mutt/SOURCES-bin
+
+- creates symlinks for all files found in SOURCES-bin/ into ../SOURCES/
+
+ (rpm doesn't handle symlinks, this allows us to have explicit links and
+ proper src.rpm generates by rpmbuild)
+
+In case the path doesn't exist in the binrepo it will not fail, as we may
+have not imported all packages or the repository is not prepared to work on
+this model, etc.
+
+markrelease of a package
+------------------------
+
+::
+
+ $ mgarepo markrelease
+
+- will copy current/ to releases/VERSION/RELEASE, as usual
+
+- will copy current/ to releases/, on the binrepo too
+
+Optionally, markrelease could create revprops indicating which is the
+revision of current/ on the binrepo that represents the tarballs that are
+being tagged.
+
+
+Use cases to be implemented after the first phase
+=================================================
+
+upgrading to a newer version of the package
+-------------------------------------------
+
+::
+
+ $ cd bla/SOURCES/
+ $ wget http://prdownloads.sourceforge.net/bla/bla-1.6.tar.bz2
+ $ mgarepo upload bla-1.6.0.tar.bz2
+
+- mgarepo notices this is a tarball (checking filename and/or file size)
+
+- mgarepo will move the file to SOURCES-bin/, create the symlink, and svn-add
+ it to the working copy
+
+ $ # the user updates the spec
+
+ $ mgarepo rm SOURCES/bla-1.5.1.tar.bz2
+
+- it will remove the symlink and run svn rm on
+ SOURCES-bin/bla-1.6.0.tar.bz2::
+
+ $ cd ../ # package top dir
+ $ mgarepo ci
+
+- mgarepo will commit the new tarball on SOURCES-bin/ and then on the rest
+ of the working copy
+
+mgarepo sync would perform these steps too.
+
+importing a package
+-------------------
+
+ $ mgarepo putsrpm mypkg.src.rpm
+
+- mgarepo will open the src.rpm
+
+- will look for tarballs inside SOURCES/ and import them to
+ http://svn.mageia.org/svn/binrepo/cauldron/mypkg/current/SOURCES/
+
+- will move the tarballs out of SOURCES and import the remaining files to
+ http://svn.mageia.org/svn/packages/cauldron/mypkg/current/
+
+- will do whatever else putsrpm already does
+
+TODO
+=====
+
+First phase
+-----------
+
+- upload
+- markrelease
+- putsrpm
+- getsrpm
+
+
+Second phase
+------------
+
+- up
+- sync
+
+Rejected or postponed ideas
+===========================
+
+Use of a plain filesystem storage for the tarballs
+--------------------------------------------------
+
+This was planned, then rejected. It becomes too complicated when thinking
+about markrelease, and mapping SVN revisions in the main repository to
+binaries versions in the "tarballs storage", basically requiring
+implementing VCS-like features on top of filesystem. Would also require
+implementing another authentication and access scheme. The main feature
+would be ease of removing old binaries, which isn't much of a point because
+we don't know precisely what and when we want to remove, so may end up not
+removing much files anyway.
+
+Use of a plain unversioned filesystem storage for the tarballs
+--------------------------------------------------------------
+
+Different than the previous one, this would mean not relying at all on
+binary files history keeping. Structure could be something simple like::
+
+ packages/${pkg:0:1}/$pkg/$tarball
+
+This alternative does not suffice for Cooker, nor for supported distros, for
+which we want history. It could, however, at some point be used for "very
+old" distros, for which we may have lost interest in keeping *binaries*
+history (package history will kept "forever" in the main SVN repository).
+Alternatively, "resetting" an SVN binrepo (i.e. recreate the repository) to
+contain only the latest tarballs would probably take about the same amount
+of space, anyway...
+
+Open tarballs repository
+------------------------
+
+This idea is not really rejected. It does not go against splitting txtrepo
+and binrepo, but rather complement this idea, where the
+open-tarballs-repository would take the place of the binrepo. The txtrepo
+would still be used +- the same way. This repository could be used
+selectively, for packages where it makes sense, while most packages could be
+kept "closed", still as tarballs.
+
+Use of externals for more seamless Subversion usage
+---------------------------------------------------
+
+This idea is not discarded, but it just provides easiness. OTOH, it makes
+things more complicated:
+
+- markrelease: externals would have to be updated in order to make it point
+ to the tagged version in the binrepo, otherwise changes in
+ current at binrepo would change older releases;
+- branching whole distro: even though subversion now supports "relative
+ externals", we would have to update the URLs for *every* package on the
+ distro, as the path to reach the binrepo spans the local distribution
+ directory;
+- keeping externals up-to-date (as stated above and below)
+- authentication and access control: only markrelease action done by the
+ build system should be allowed to change externals (so what about importing
+ new packages?)
+- just a convenience, we don't need and shouldn't rely on externals for
+ running the build system, while most people will use the repositories via
+ Repsys, so why spend time to implement and keep it?
+- "svn co" works transparently, cool, but "svn co -r N" does not, otherwise
+ every change in the binrepo would require svn:externals to be updated in
+ the respective package;
+- it does not solve the problem of creating and handling symlinks between
+ SOURCES and SOURCES-bin.
+
+Keeping svn:externals updated for every package has almost the same cost of
+keeping the `sha1.lst` updated, with the difference that in the latter we
+would not have to update every package when creating distro branches.
+
+Use of "external" xdelta to save space on binaries
+--------------------------------------------------
+
+But how? First idea is this could be done by defining a protocol and
+assuming repository manipulation with mgarepo (for ease). Repsys could
+xdelta tarballs and add it to SVN with a special filename, then use it when
+checking out. Would require a policy/algorithm on when to ditch old whole
+binaries, too (i.e. hopefully wouldn't need to be handled manually by the
+maintainer). Also, this is something complemental to splitting the
+repository, so we may do it later, for binrepos.
+
+
+The Future
+==========
+
+- Open tarballs repositories
+
+ - suited for GIT, maybe multi-VCS
+ - incremental move
+ - not everything will be suited for this, must handle all cases or be
+ optional
+
+- Xdelta
+
Modified: build_system/mgarepo/trunk/README.LDAP
===================================================================
--- build_system/mgarepo/trunk/README.LDAP 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/README.LDAP 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,7 +1,7 @@
A Repsys plugin for obtaining users from a LDAP server.
In order to enable the plugin, the user must define the following
-options in the [global] section of repsys.conf:
+options in the [global] section of mgarepo.conf:
ldap-uri [required if ldap-server is unset]
the URI of the server, you can refer to more than one server by
@@ -52,8 +52,8 @@
Note that only the first value of the attributes will be
used.
-When the searched option is not found, it will try in repsys.conf. All
-the values found. (including from repsys.conf) will be cached between
+When the searched option is not found, it will try in mgarepo.conf. All
+the values found. (including from mgarepo.conf) will be cached between
each configuration access.
This plugin requires the package python-ldap.
Modified: build_system/mgarepo/trunk/create-srpm
===================================================================
--- build_system/mgarepo/trunk/create-srpm 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/create-srpm 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,10 +1,10 @@
#!/usr/bin/python
-from RepSys import Error, config, plugins, layout
-from RepSys.mirror import strip_username
-from RepSys.rpmutil import get_srpm
-from RepSys.cgiutil import get_targets
-from RepSys.util import mapurl, execcmd, get_helper
+from MgaRepo import Error, config, plugins, layout
+from MgaRepo.mirror import strip_username
+from MgaRepo.rpmutil import get_srpm
+from MgaRepo.cgiutil import get_targets
+from MgaRepo.util import mapurl, execcmd, get_helper
import sys
import os
import pwd
Modified: build_system/mgarepo/trunk/default.chlog
===================================================================
--- build_system/mgarepo/trunk/default.chlog 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/default.chlog 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,5 +1,5 @@
##
-## Default changelog format for Mandriva Linux
+## Default changelog format for Mageia
##
#if not $releases_by_author[-1].visible
## Hide the first release that contains no changes. It must be a
Copied: build_system/mgarepo/trunk/mgarepo (from rev 264, build_system/mgarepo/trunk/repsys)
===================================================================
--- build_system/mgarepo/trunk/mgarepo (rev 0)
+++ build_system/mgarepo/trunk/mgarepo 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,93 @@
+#!/usr/bin/python
+from MgaRepo import Error, plugins, config
+from MgaRepo.command import *
+import getopt
+import sys
+
+VERSION="1.9.4"
+
+HELP = """\
+Usage: mgarepo COMMAND [COMMAND ARGUMENTS]
+
+Tool to access and manage a package repository structure.
+
+http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem/Quickstart
+
+Useful commands:
+ co checkout a package
+ ci commit changes
+ sync add-remove all file changes from the .spec
+ submit submit a package for build
+ putsrpm import a source package to the repository
+ getspec prints the spec
+ rpmlog prints the RPM changelog
+ getsrpm creates the source RPM
+ create create the structure of a new package
+ changed shows changes not submitted
+ authoremail prints the e-mail of a given author
+ switch relocate to mirror or upstream repository
+
+Run "mgarepo COMMAND --help" and "man 8 mgarepo" for more information.
+
+Written by Gustavo Niemeyer <gustavo at niemeyer.net>
+"""
+
+command_aliases = {"import": "putsrpm"}
+
+def plugin_help(opt, val, parser, mode):
+ if parser is None:
+ prog = sys.argv[0]
+ print "Use %s --help-plugin <plugin name>" % prog
+ print "Available plugins:"
+ print
+ for name in plugins.list():
+ print name
+ else:
+ print plugins.help(parser)
+ raise SystemExit
+
+def parse_options():
+ parser = OptionParser(help=HELP, version="%prog "+VERSION)
+ parser.disable_interspersed_args()
+ parser.add_option("--debug", action="store_true")
+ parser.add_option("--help-plugins", action="callback", callback=plugin_help)
+ parser.add_option("--help-plugin", type="string", dest="__ignore",
+ action="callback", callback=plugin_help)
+ opts, args = parser.parse_args()
+ del opts.__ignore
+ if len(args) < 1:
+ parser.print_help(sys.stderr)
+ sys.exit(1)
+ opts.command = args[0]
+ opts.argv = args
+ return opts
+
+def dispatch_command(command, argv, debug=0):
+ sys.argv = argv
+ try:
+ command = command_aliases[command]
+ except KeyError:
+ pass
+ if debug:
+ config.set("global", "verbose", "yes")
+ try:
+ repsys_module = __import__("MgaRepo.commands."+command)
+ commands_module = getattr(repsys_module, "commands")
+ command_module = getattr(commands_module, command)
+ except (ImportError, AttributeError):
+ etype, exc, tb = sys.exc_info()
+ if tb.tb_next is None and not debug:
+ raise Error, "invalid command '%s'" % command
+ raise
+ command_module.main()
+
+if __name__ == "__main__":
+ try:
+ plugins.load()
+ except Error, e:
+ sys.stderr.write("plugin initialization error: %s\n" % e)
+ sys.exit(1)
+ config.set("global", "mgarepo-cmd", sys.argv[0])
+ do_command(parse_options, dispatch_command)
+
+# vim:et:ts=4:sw=4
Copied: build_system/mgarepo/trunk/mgarepo-example.conf (from rev 264, build_system/mgarepo/trunk/repsys-example.conf)
===================================================================
--- build_system/mgarepo/trunk/mgarepo-example.conf (rev 0)
+++ build_system/mgarepo/trunk/mgarepo-example.conf 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,74 @@
+[global]
+verbose = no
+repository = svn+ssh://svn.mageia.org/svn/packages/
+url-map = svn\+ssh://svn\.mageia\.org/(.*) file:///\1
+#tempdir = /tmp
+## the command used to download files when using mgarepo sync -d
+#download-command = wget -c -O '$dest' $url
+svn-env = SVN_SSH=/home/me/my-ssh-wrapper
+ SVN_FOO=bar
+
+[log]
+oldurl = svn+ssh://svn.mageia.org/svn/packages/misc
+sort = yes
+merge-spec = no
+# controls up to which revision the rpm changelog
+# will be constructed (default zero, i.e., oldest
+# commit)
+revision-offset = 0
+# commit lines containing this string won't be shown in the changelog:
+ignore-string = SILENT
+# and in case of only allowing a few lines to be visible, use this:
+#unignore-string = CLOG
+
+[template]
+# set the cheetah template used to generate the spec changelog from svn
+path = /usr/share/mgarepo/default.chlog
+
+[helper]
+# create-srpm is called by mgarepo on the server-side when submitting a
+# package
+create-srpm = /usr/share/mgarepo/create-srpm
+# upload-srpm is called by create-srpm to copy the generated .src.rpm to
+# the proper build queue
+upload-srpm = /usr/local/bin/youri.devel
+
+# this section maps usernames found in svn commits to the ones that must be
+# shown in the changelog
+# users can be retrieved from LDAP through the use of the mgarepo-ldap
+# plugin
+[users]
+# jsmith = John Smith <jsmith26 at example.com>
+#
+
+[srpm]
+# runs "make -C current/ srpm-prep" on the package before creating the
+# srpm file
+run-prep = yes
+
+[submit]
+host = pkgsubmit.mageia.org
+default = Cauldron
+
+[submit Cauldron]
+target = /export/home/mgarepo
+allowed = svn+ssh://svn.mageia.org/svn/packages/cauldron
+scripts = /usr/share/mgarepo/rebrand-mdk
+##
+## rpm-macros refers to the sections containing the macros used for this
+## target. The values will be used to build the rpmbuild command line. For
+## example:
+##
+## [macros cauldron]
+## a = b
+## c = %a
+##
+## will render in the command line: --define "a b" --define "c %a".
+##
+#rpm-macros = global cooker
+
+#[macros global]
+#distsuffix = mga
+
+#[macros cauldron]
+#mageia_release = 2
Copied: build_system/mgarepo/trunk/mgarepo-ssh (from rev 264, build_system/mgarepo/trunk/repsys-ssh)
===================================================================
--- build_system/mgarepo/trunk/mgarepo-ssh (rev 0)
+++ build_system/mgarepo/trunk/mgarepo-ssh 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,2 @@
+#!/bin/sh
+ssh -o "BatchMode yes" $*
Copied: build_system/mgarepo/trunk/mgarepo.8 (from rev 264, build_system/mgarepo/trunk/repsys.8)
===================================================================
--- build_system/mgarepo/trunk/mgarepo.8 (rev 0)
+++ build_system/mgarepo/trunk/mgarepo.8 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,219 @@
+.\" mgarepo - Package repository management tool
+.TH "mgarepo" "8" "2011 Jan 11" "Mageia" ""
+.SH "NAME"
+mgarepo \- Package sources repository management tool
+.SH "SYNOPSIS"
+\fBmgarepo\fP command [options] [arguments]
+.SH "DESCRIPTION"
+\fBmgarepo\fP is the tool used to manage RPM packages in a subversion repository. It is used to create, tag releases, generate .src.rpm, generate changelog, and request new package releases for build. It mostly acts as a interface to svn(1) commands and small task scripts run on the build system side over ssh(1).
+
+Most of the \fBmgarepo\fP commands operate on a given package URL, these URLs can be omitted when the configuration option \fBrepository\fP is set.
+
+Detailed help on commands is available running \fBmgarepo <command> \-\-help\fP.
+.SH "BASIC USAGE"
+.SS "Setup"
+\fBmgarepo\fP does not handle the authentication interface used by svn. So it is usually required to setup ssh\-agent(1) if the repository access method is over SSH (svn+ssh:// URLs), or performing some simple operation in order to obtain a authentication token.
+
+.nf
+For more information related how to setup ssh-agent, see:
+http://wiki.mandriva.com/en/Development/Docs/Contributor_Tricks#SSH_configuration
+.fi
+
+Users that don't have an ssh account in the default repository URL can set the option \fBmirror\fP pointing to a non-authenticated, read-only repository (such as http://svn.mageia.org/svn/packages).
+.SS "Examples"
+.PP
+.IP "\fBmgarepo co foo\fP"
+Obtains a working copy of the package foo.
+.IP "\fBmgarepo co 1/mutt\fP"
+Obtains a working copy of the package mutt of from the 1 branch.
+.IP "\fBmgarepo ci\fP"
+Commits pending changes in the working copy.
+.IP "\fBmgarepo submit foo \-r 12345\fP"
+Requests the package foo in the revision 12345 to be built and, if successful, to be uploaded to the RPMs repository.
+.IP "\fBmgarepo submit foo \-r 12345 -t 1 \-\-define section=core/testing\fP"
+Will submit the package foo and, upon successful build will have its RPMs placed inside the core/testing media of the 1 repository.
+.IP "\fBmgarepo submit\fP"
+submit run without parameters will use package name and revision found in the working copy in the current directory.
+.SH "COMMANDS"
+For detailed help on commands run \fBmgarepo <command> \-\-help\fP.
+\#TODO complete list of commands, all options, all descriptions
+.PP
+.IP "\fBco\fP"
+checkout a package
+.IP "\fBci\fP"
+commit changes
+.IP "\fBsubmit\fP"
+submit a package in a given revision for build and release
+.IP "\fBsync\fP"
+add-remove all file changes from the .spec
+.IP "\fBgetspec\fP"
+prints the spec
+.IP "\fBrpmlog\fP"
+prints the RPM changelog generated from SVN
+.IP "\fBgetsrpm\fP"
+creates the source RPM
+.IP "\fBcreate\fP"
+create the structure of a new package
+.IP "\fBchanged\fP"
+shows changes not submitted
+.IP "\fBauthoremail\fP"
+prints the e-mail of a given svn author
+.IP "\fBswitch\fP"
+relocate to mirror or upstream repository
+.IP "\fBmarkrelease\fP"
+creates a tag for a given package revision and version
+.SH "REPOSITORY LAYOUT"
+.nf
+A detailed description can be found at:
+http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
+.fi
+
+The svn repository used by \fBmgarepo\fP consists of a set of branches in the top directory, followed by package directories having the internal package structure.
+
+The internal package layout contains a directory \fBcurrent/\fP, which contains the latest version of the package (equivalent to "trunk" in software repositories). The directory \fBreleases/\fP contain copies of older submitted packages that have been already released, it is organized in the \fB<version>/<release>\fP format (equivalent to "tags" directories).
+
+URLs used in \fBmgarepo\fP commands refer to the package directory, and never to \fBcurrent\fP. In other words, the http://host/svn/cauldron/foo is valid, whereas http://host/svn/cauldron/foo/current is not.
+
+One example layout:
+
+\fB
+/packages/cauldron
+ |
+ +\- cauldron/
+ | ...
+ | +\- rsync/
+ | +\- coreutils/
+ | +\- make/
+ | +\- foo/
+ | +\- current/
+ | | +\- SOURCES/
+ | | +\- SPECS/
+ | +\- releases/
+ | ...
+ | +\- 1.0
+ | +\- 1.mga1/
+ | +\- SOURCES/
+ | +\- SPECS/
+ | +\- 2.mga1/
+ | ...
+ +\- updates/
+ +\- 1/
+ +\- 2/
+ +\- 3/
+\fP
+.SS "Setting up a repository"
+The minimal setup is accomplished with a Subversion repository having three directories: \fBcauldron/\fP, \fBmisc/\fP and \fBupdates/\fP. The name of this directories can be changed using the configuration options \fBtrunk\-dir\fP and \fBbranches-dir\fP. Having this you can start importing packages with \fBmgarepo import\fP.
+\#.SH "THE SUBMIT PROCESS"
+\#.SS "Connecting"
+\#.SS "Changelog generation"
+\#.SS "Uploading"
+\#.SH CHANGELOGS
+\#.SH SERVER\-SIDE SETUP
+.SH "CONFIGURATION"
+.SS "Introduction"
+The main configuration file is \fB/etc/mgarepo.conf\fP, it is in the .ini format. It is basically defined by a set of \fB[name]\fP sections, with a set of variables defined by \fBname = value\fP.
+
+If existing, the file ~/.mgarepo/config is also loaded.
+.SS "[global] section"
+.PP
+.IP "\fBrepository = URL\fP"
+Contains the base URL used to access packages in the svn repository when only package names are used in mgarepo commands. For example, if \fBmgarepo co trafshow\fP is run and repository is http://host/svn/, the URL http://host/svn/cauldron/trafshow will be used ("cauldron" is the default branch).
+.IP "\fBdefault_parent = URL\fP"
+Points to the base URL of the development branch of the svn repository. This option is deprecated as it has been replaced by "repository".
+.IP "\fBmirror = URL\fP"
+The URL of an alternative and read\-only repository to be used when checking out packages. \fBmgarepo ci\fP will automatically relocate to "repository" when comitting.
+.IP "\fBuse-mirror = yes/no\fP"
+Disable the use of the mirror repository when checking out packages.
+.IP "\fBurl\-map = MATCH\-REGEXP REPLACE\-EXPR\fP"
+This option is used on server-side to remap remote URLs brought by the user when running \fBmgarepo submit\fP to local (and probably faster) URLs. \fBMATCH\-REGEXP\fP is a Python regular expression matching the components that must be reused in the local URL. \fbREPLACE\-EXPR\fP is a replace expression that should expand in the final URL. Example: \fBsvn\+ssh://svn\.mageia\.org/(.*) file:///\1\fP
+.IP "\fBtempdir = PATH\fP"
+The directory to be used as base for temporay directories and files created by mgarepo.
+.IP "\fBdownload\-command = COMMAND\-FMT\fP"
+Command used to download generic remote URLs, it accepts the variables \fB$url\fP and \fB$dest\fP. It is currently used when running \fBmgarepo sync \-d\fP.
+.IP "\fBsvn\-command = COMMAND\fP"
+The base command used to execute svn(1). Runs through system(3).
+.IP "\fBsvn-env = VAR=VALUE ..\fP"
+The environment variables to use when running svn. More entries can be defined by using more lines. The variable defined by default is \fBSVN_SSH\fP, which points to the \fBmgarepo-ssh\fP ssh wrapper.
+.IP "\fBverbose = yes/no\fP"
+Increase the verbosity of mgarepo output, printing commands being run and complete traceback when unhanlded errors happen.
+.IP "\fBtrunk-dir\fP"
+Points to the default branch of the distro used in commands that do not have their branch or URL specified.
+.IP "\fBbranches-dir\fP"
+The directory inside the repository which contains all the branches of the distro. It is used to build the URL of packages referred using the branch notation BRANCH/PACKAGE, as in \fBmgarepo co 1/mutt\fP.
+.SS "[submit-groups] section"
+This section contains aliases to groups of packages to be submitted at once. For example, a line with \fBmy-python-packages = bzr bzrtools bzr-gtk\fP would allow the user to simply run \fBmgarepo submit my-python-packages\fP.
+
+Also distro branches or revision numbers can be specified for each package group. For example: \fBmgarepo submit 1/my-python-packages\fP.
+.SS "[submit] section"
+.IP "\fBhost = HOST\fP"
+Defines the default host in which \fBmgarepo submit\fP will run the submit helper.
+.IP "\fBdefault = TARGET\fP"
+The default target to be used in \fBmgarepo submit\fP when the option \-t is not used.
+.SS "[submit TARGET] sections (server\-side only)"
+These sections describe each one of the sections available to submit packages, ther configuration options are:
+.IP "\fBtarget = PATH\fP"
+The path where SRPMs generated by \fBcreate\-srpm-\fP will be placed during during the submit process.
+.IP "\fBallowed = URLs\fP"
+A space\-delimited list of package URLs that will be allowed to be used with this target. The comparison is done by checking if the package URL used in submit starts with one of the URLs of this option.
+.IP "\fBscripts = PATHS\fP"
+A space\-delimited list of scripts that will be run receiving the generated SRPM as first argument. These scripts are usually used to perform small changes in the SRPM structure, increasing release number for example.
+.IP "\fBrpm\-macros = NAMES\fP"
+It points to sections in the configuration that will contain the RPM macros used when generating the SRPM of the package being submitted. These section should be named in the \fB[macros NAME]\fP format.
+.SS "[macros NAME] sections (server\-side only)"
+These sections contain variables that will be defined as RPM macros when generating the SRPM of the package being submitted.It is usually used to define the distribution suffix that will be used in package releases, such as "mga1".
+.SS "[users] section (server\-side only)"
+This section maps the usernames found in svn to their real names and e\-mails. It is used when generating the changelog based on commits in svn and by \fBauthoremail\fP. Example: \fBjoe = Joe User <joeuser at host.com>\fP.
+
+This section can be used on client\-side too, but will have no effect in generated changelogs on the server\-side.
+.SS "[helper] section"
+.IP "\fBcreate\-srpm = PATH\fP"
+The path of the script that will be run through ssh on the submit host when running \fBmgarepo submit\fP.
+.IP "\fBupload\-srpm = PATH\fP"
+(server\-side only) Path of the script that will be called after the generated SRPM is copied to its target location (see target sections above) and target scripts are run.
+.IP "\fBrpmbuild = COMMAND\fP"
+The command used to call rpmbuild. Note that build options (such as \-bs) are supplied by mgarepo.
+.SS "[log] section"
+.IP "\fBoldurl = URL\fP"
+The URL of a directory structure that will contain old changelogs of packages that will be appended to the changelog being generated by \fBrpmlog\fP or \fBgetsrpm \-l\fP.
+.IP "\fBmerge\-spec = yes/no\fP"
+If enabled, changelogs generated by \fBmgarepo\fP will have the contents of the %changelog found in the .spec file of the package appended.
+.IP "\fBsort = yes/no\fP"
+If enabled, the changelog will be resorted after its generation. It is useful when changelogs found in \fBoldurl\fP or in the .spec's %changelog section are newer than those generated by SVN.
+.IP "\fBrevision\-offset = REVISION\-NUMBER\fP"
+The base revision used to generated changelogs. As in \fBsvn log -r REVISION\-OFFSET:HEAD URL\fP.
+.IP "\fBignore\-string = STRING\fP"
+Mark used to hide log messages. When it appears at the beginning of the log message, the whole changeset log is hidden. When it is found in the middle of a string, only the line will not be shown.
+.IP "\fBunignore\-string = STRING\fP"
+The complement of the previous option. When this token is found, only those lines containg this mark will be shown. It is intended to be used in very long log messages.
+.SS "[template] section"
+.IP "\fBpath = PATH\fP"
+The path of the template used to generate the changelog from svn commits.
+.SS "[srpm] section"
+.IP "\fBrun-prep = yes/no\fP"
+Repsys can check for the presence of a file named \fBMakefile\fP in the top directory of the package and run \fBmake prep-srpm\fP so that it can generate the actual files that must be distributed in in the srpm. This option enables this feature. (Note: the command is expected to run in an restricted environment, the Makefile must use only minimal funcionalities.)
+.SH "ENVIRONMENT VARIABLES"
+.PP
+.IP "\fBREPSYS_CONF\fP"
+Sets the configuration file to be read by \fBmgarepo\fP
+.SH "FILES"
+.nf
+~/.mgarepo/config
+/etc/mgarepo.conf
+/usr/share/mgarepo/
+/usr/share/doc/mgarepo/
+.fi
+.SH "BUGS"
+See the list of bugs at http://bugs.mageia.org/buglist.cgi?quicksearch=mgarepo
+.SH "SEE ALSO"
+mdvsys(1), svn(1), ssh\-agent(1)
+
+.nf
+http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem/Quickstart
+.fi
+.SH "AUTHOR"
+.nf
+repsys was originally written by Gustavo Niemeyer <gustavo at niemeyer.net>
+for the Conectiva Linux distribution. It was then maintained by Mandriva
+contributors and employees. mgarepo is a fork of repsys maintained by
+Mageia contributors.
+.fi
Copied: build_system/mgarepo/trunk/mgarepo.conf (from rev 264, build_system/mgarepo/trunk/repsys.conf)
===================================================================
--- build_system/mgarepo/trunk/mgarepo.conf (rev 0)
+++ build_system/mgarepo/trunk/mgarepo.conf 2011-01-11 00:35:59 UTC (rev 265)
@@ -0,0 +1,20 @@
+# see man 8 mgarepo for a description on configuration options
+[global]
+repository = svn+ssh://svn.mageia.org/svn/packages/
+trunk-dir = cauldron/
+
+## uncomment it in case you don't have a account in the Mageia build system:
+#mirror = http://svn.mageia.org/svn/packages/cauldron/
+use-binaries-repository = yes
+binaries-repository = svn+ssh://svn.mageia.org/svn/binrepos
+
+[log]
+oldurl = svn+ssh://svn.mageia.org/svn/packages/misc
+
+[helper]
+create-srpm = /usr/share/repsys/create-srpm
+upload-srpm = /usr/local/bin/youri.devel
+
+[submit]
+host = pkgsubmit.mageia.org
+default = Cauldron
Deleted: build_system/mgarepo/trunk/repsys
===================================================================
--- build_system/mgarepo/trunk/repsys 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/repsys 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,93 +0,0 @@
-#!/usr/bin/python
-from RepSys import Error, plugins, config
-from RepSys.command import *
-import getopt
-import sys
-
-VERSION="1.9.4"
-
-HELP = """\
-Usage: repsys COMMAND [COMMAND ARGUMENTS]
-
-Tool to access and manage a package repository structure.
-
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem/Quickstart
-
-Useful commands:
- co checkout a package
- ci commit changes
- sync add-remove all file changes from the .spec
- submit submit a package for build
- putsrpm import a source package to the repository
- getspec prints the spec
- rpmlog prints the RPM changelog
- getsrpm creates the source RPM
- create create the structure of a new package
- changed shows changes not submitted
- authoremail prints the e-mail of a given author
- switch relocate to mirror or upstream repository
-
-Run "repsys COMMAND --help" and "man 8 repsys" for more information.
-
-Written by Gustavo Niemeyer <gustavo at niemeyer.net>
-"""
-
-command_aliases = {"import": "putsrpm"}
-
-def plugin_help(opt, val, parser, mode):
- if parser is None:
- prog = sys.argv[0]
- print "Use %s --help-plugin <plugin name>" % prog
- print "Available plugins:"
- print
- for name in plugins.list():
- print name
- else:
- print plugins.help(parser)
- raise SystemExit
-
-def parse_options():
- parser = OptionParser(help=HELP, version="%prog "+VERSION)
- parser.disable_interspersed_args()
- parser.add_option("--debug", action="store_true")
- parser.add_option("--help-plugins", action="callback", callback=plugin_help)
- parser.add_option("--help-plugin", type="string", dest="__ignore",
- action="callback", callback=plugin_help)
- opts, args = parser.parse_args()
- del opts.__ignore
- if len(args) < 1:
- parser.print_help(sys.stderr)
- sys.exit(1)
- opts.command = args[0]
- opts.argv = args
- return opts
-
-def dispatch_command(command, argv, debug=0):
- sys.argv = argv
- try:
- command = command_aliases[command]
- except KeyError:
- pass
- if debug:
- config.set("global", "verbose", "yes")
- try:
- repsys_module = __import__("RepSys.commands."+command)
- commands_module = getattr(repsys_module, "commands")
- command_module = getattr(commands_module, command)
- except (ImportError, AttributeError):
- etype, exc, tb = sys.exc_info()
- if tb.tb_next is None and not debug:
- raise Error, "invalid command '%s'" % command
- raise
- command_module.main()
-
-if __name__ == "__main__":
- try:
- plugins.load()
- except Error, e:
- sys.stderr.write("plugin initialization error: %s\n" % e)
- sys.exit(1)
- config.set("global", "repsys-cmd", sys.argv[0])
- do_command(parse_options, dispatch_command)
-
-# vim:et:ts=4:sw=4
Deleted: build_system/mgarepo/trunk/repsys-example.conf
===================================================================
--- build_system/mgarepo/trunk/repsys-example.conf 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/repsys-example.conf 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,74 +0,0 @@
-[global]
-verbose = no
-repository = svn+ssh://svn.mandriva.com/svn/packages/
-url-map = svn\+ssh://svn\.mandriva\.com/(.*) file:///\1
-#tempdir = /tmp
-## the command used to download files when using repsys sync -d
-#download-command = wget -c -O '$dest' $url
-svn-env = SVN_SSH=/home/me/my-ssh-wrapper
- SVN_FOO=bar
-
-[log]
-oldurl = svn+ssh://svn.mandriva.com/svn/packages/misc
-sort = yes
-merge-spec = no
-# controls up to which revision the rpm changelog
-# will be constructed (default zero, i.e., oldest
-# commit)
-revision-offset = 0
-# commit lines containing this string won't be shown in the changelog:
-ignore-string = SILENT
-# and in case of only allowing a few lines to be visible, use this:
-#unignore-string = CLOG
-
-[template]
-# set the cheetah template used to generate the spec changelog from svn
-path = /usr/share/repsys/default.chlog
-
-[helper]
-# create-srpm is called by repsys on the server-side when submitting a
-# package
-create-srpm = /usr/share/repsys/create-srpm
-# upload-srpm is called by create-srpm to copy the generated .src.rpm to
-# the proper build queue
-upload-srpm = /usr/local/bin/youri.devel
-
-# this section maps usernames found in svn commits to the ones that must be
-# shown in the changelog
-# users can be retrieved from LDAP through the use of the repsys-ldap
-# plugin
-[users]
-# jsmith = John Smith <jsmith26 at example.com>
-#
-
-[srpm]
-# runs "make -C current/ srpm-prep" on the package before creating the
-# srpm file
-run-prep = yes
-
-[submit]
-host = kenobi.mandriva.com
-default = Cooker
-
-[submit Cooker]
-target = /export/home/repsys
-allowed = svn+ssh://svn.mandriva.com/svn/packages/cooker
-scripts = /usr/share/repsys/rebrand-mdk
-##
-## rpm-macros refers to the sections containing the macros used for this
-## target. The values will be used to build the rpmbuild command line. For
-## example:
-##
-## [macros cooker]
-## a = b
-## c = %a
-##
-## will render in the command line: --define "a b" --define "c %a".
-##
-#rpm-macros = global cooker
-
-#[macros global]
-#distsuffix = mdv
-
-#[macros cooker]
-#mandriva_release = 2007.1
Deleted: build_system/mgarepo/trunk/repsys-ssh
===================================================================
--- build_system/mgarepo/trunk/repsys-ssh 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/repsys-ssh 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,2 +0,0 @@
-#!/bin/sh
-ssh -o "BatchMode yes" $*
Deleted: build_system/mgarepo/trunk/repsys.8
===================================================================
--- build_system/mgarepo/trunk/repsys.8 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/repsys.8 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,218 +0,0 @@
-.\" repsys - Package repository management tool
-.TH "repsys" "8" "2008 Feb 8" "Mandriva Linux" ""
-.SH "NAME"
-repsys \- Package sources repository management tool
-.SH "SYNOPSIS"
-\fBrepsys\fP command [options] [arguments]
-.SH "DESCRIPTION"
-\fBrepsys\fP is the tool used to manage RPM packages in a subversion repository. It is used to create, tag releases, generate .src.rpm, generate changelog, and request new package releases for build. It mostly acts as a interface to svn(1) commands and small task scripts run on the build system side over ssh(1).
-
-Most of the \fBrepsys\fP commands operate on a given package URL, these URLs can be omitted when the configuration option \fBrepository\fP is set.
-
-Detailed help on commands is available running \fBrepsys <command> \-\-help\fP.
-.SH "BASIC USAGE"
-.SS "Setup"
-\fBrepsys\fP does not handle the authentication interface used by svn. So it is usually required to setup ssh\-agent(1) if the repository access method is over SSH (svn+ssh:// URLs), or performing some simple operation in order to obtain a authentication token.
-
-.nf
-For more information related how to setup ssh-agent, see:
-http://wiki.mandriva.com/en/Development/Docs/Contributor_Tricks#SSH_configuration
-.fi
-
-Users that don't have an ssh account in the default repository URL can set the option \fBmirror\fP pointing to a non-authenticated, read-only repository (such as http://svn.mandriva.com/svn/packages).
-.SS "Examples"
-.PP
-.IP "\fBrepsys co foo\fP"
-Obtains a working copy of the package foo.
-.IP "\fBrepsys co 2009.0/mutt\fP"
-Obtains a working copy of the package mutt of from the 2009.0 branch.
-.IP "\fBrepsys ci\fP"
-Commits pending changes in the working copy.
-.IP "\fBrepsys submit foo \-r 12345\fP"
-Requests the package foo in the revision 12345 to be built and, if successful, to be uploaded to the RPMs repository.
-.IP "\fBrepsys submit foo \-r 12345 -t 2008.0 \-\-define section=main/testing\fP"
-Will submit the package foo and, upon successful build will have its RPMs placed inside the main/testing media of the 2008.0 repository.
-.IP "\fBrepsys submit\fP"
-submit run without parameters will use package name and revision found in the working copy in the current directory.
-.SH "COMMANDS"
-For detailed help on commands run \fBrepsys <command> \-\-help\fP.
-\#TODO complete list of commands, all options, all descriptions
-.PP
-.IP "\fBco\fP"
-checkout a package
-.IP "\fBci\fP"
-commit changes
-.IP "\fBsubmit\fP"
-submit a package in a given revision for build and release
-.IP "\fBsync\fP"
-add-remove all file changes from the .spec
-.IP "\fBgetspec\fP"
-prints the spec
-.IP "\fBrpmlog\fP"
-prints the RPM changelog generated from SVN
-.IP "\fBgetsrpm\fP"
-creates the source RPM
-.IP "\fBcreate\fP"
-create the structure of a new package
-.IP "\fBchanged\fP"
-shows changes not submitted
-.IP "\fBauthoremail\fP"
-prints the e-mail of a given svn author
-.IP "\fBswitch\fP"
-relocate to mirror or upstream repository
-.IP "\fBmarkrelease\fP"
-creates a tag for a given package revision and version
-.SH "REPOSITORY LAYOUT"
-.nf
-A detailed description can be found at:
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
-.fi
-
-The svn repository used by \fBrepsys\fP consists of a set of branches in the top directory, followed by package directories having the internal package structure.
-
-The internal package layout contains a directory \fBcurrent/\fP, which contains the latest version of the package (equivalent to "trunk" in software repositories). The directory \fBreleases/\fP contain copies of older submitted packages that have been already released, it is organized in the \fB<version>/<release>\fP format (equivalent to "tags" directories).
-
-URLs used in \fBrepsys\fP commands refer to the package directory, and never to \fBcurrent\fP. In other words, the http://host/svn/cooker/foo is valid, whereas http://host/svn/cooker/foo/current is not.
-
-One example layout:
-
-\fB
-/packages/cooker
- |
- +\- cooker/
- | ...
- | +\- rsync/
- | +\- coreutils/
- | +\- make/
- | +\- foo/
- | +\- current/
- | | +\- SOURCES/
- | | +\- SPECS/
- | +\- releases/
- | ...
- | +\- 1.0
- | +\- 1mdk/
- | +\- SOURCES/
- | +\- SPECS/
- | +\- 2mdk/
- | ...
- +\- updates/
- +\- 2007.0/
- +\- 2007.1/
- +\- 2008.0/
-\fP
-.SS "Setting up a repository"
-The minimal setup is accomplished with a Subversion repository having three directories: \fBcooker/\fP, \fBmisc/\fP and \fBupdates/\fP. The name of this directories can be changed using the configuration options \fBtrunk\-dir\fP and \fBbranches-dir\fP. Having this you can start importing packages with \fBrepsys import\fP.
-\#.SH "THE SUBMIT PROCESS"
-\#.SS "Connecting"
-\#.SS "Changelog generation"
-\#.SS "Uploading"
-\#.SH CHANGELOGS
-\#.SH SERVER\-SIDE SETUP
-.SH "CONFIGURATION"
-.SS "Introduction"
-The main configuration file is \fB/etc/repsys.conf\fP, it is in the .ini format. It is basically defined by a set of \fB[name]\fP sections, with a set of variables defined by \fBname = value\fP.
-
-If existing, the file ~/.repsys/config is also loaded.
-.SS "[global] section"
-.PP
-.IP "\fBrepository = URL\fP"
-Contains the base URL used to access packages in the svn repository when only package names are used in repsys commands. For example, if \fBrepsys co trafshow\fP is run and repository is http://host/svn/, the URL http://host/svn/cooker/trafshow will be used ("cooker" is the default branch).
-.IP "\fBdefault_parent = URL\fP"
-Points to the base URL of the development branch of the svn repository. This option is deprecated as it has been replaced by "repository".
-.IP "\fBmirror = URL\fP"
-The URL of an alternative and read\-only repository to be used when checking out packages. \fBrepsys ci\fP will automatically relocate to "repository" when comitting.
-.IP "\fBuse-mirror = yes/no\fP"
-Disable the use of the mirror repository when checking out packages.
-.IP "\fBurl\-map = MATCH\-REGEXP REPLACE\-EXPR\fP"
-This option is used on server-side to remap remote URLs brought by the user when running \fBrepsys submit\fP to local (and probably faster) URLs. \fBMATCH\-REGEXP\fP is a Python regular expression matching the components that must be reused in the local URL. \fbREPLACE\-EXPR\fP is a replace expression that should expand in the final URL. Example: \fBsvn\+ssh://svn\.mandriva\.com/(.*) file:///\1\fP
-.IP "\fBtempdir = PATH\fP"
-The directory to be used as base for temporay directories and files created by repsys.
-.IP "\fBdownload\-command = COMMAND\-FMT\fP"
-Command used to download generic remote URLs, it accepts the variables \fB$url\fP and \fB$dest\fP. It is currently used when running \fBrepsys sync \-d\fP.
-.IP "\fBsvn\-command = COMMAND\fP"
-The base command used to execute svn(1). Runs through system(3).
-.IP "\fBsvn-env = VAR=VALUE ..\fP"
-The environment variables to use when running svn. More entries can be defined by using more lines. The variable defined by default is \fBSVN_SSH\fP, which points to the \fBrepsys-ssh\fP ssh wrapper.
-.IP "\fBverbose = yes/no\fP"
-Increase the verbosity of repsys output, printing commands being run and complete traceback when unhanlded errors happen.
-.IP "\fBtrunk-dir\fP"
-Points to the default branch of the distro used in commands that do not have their branch or URL specified.
-.IP "\fBbranches-dir\fP"
-The directory inside the repository which contains all the branches of the distro. It is used to build the URL of packages referred using the branch notation BRANCH/PACKAGE, as in \fBrepsys co 2009.0/mutt\fP.
-.SS "[submit-groups] section"
-This section contains aliases to groups of packages to be submitted at once. For example, a line with \fBmy-python-packages = bzr bzrtools bzr-gtk\fP would allow the user to simply run \fBrepsys submit my-python-packages\fP.
-
-Also distro branches or revision numbers can be specified for each package group. For example: \fBrepsys submit 2008.1/my-python-packages\fP.
-.SS "[submit] section"
-.IP "\fBhost = HOST\fP"
-Defines the default host in which \fBrepsys submit\fP will run the submit helper.
-.IP "\fBdefault = TARGET\fP"
-The default target to be used in \fBrepsys submit\fP when the option \-t is not used.
-.SS "[submit TARGET] sections (server\-side only)"
-These sections describe each one of the sections available to submit packages, ther configuration options are:
-.IP "\fBtarget = PATH\fP"
-The path where SRPMs generated by \fBcreate\-srpm-\fP will be placed during during the submit process.
-.IP "\fBallowed = URLs\fP"
-A space\-delimited list of package URLs that will be allowed to be used with this target. The comparison is done by checking if the package URL used in submit starts with one of the URLs of this option.
-.IP "\fBscripts = PATHS\fP"
-A space\-delimited list of scripts that will be run receiving the generated SRPM as first argument. These scripts are usually used to perform small changes in the SRPM structure, increasing release number for example.
-.IP "\fBrpm\-macros = NAMES\fP"
-It points to sections in the configuration that will contain the RPM macros used when generating the SRPM of the package being submitted. These section should be named in the \fB[macros NAME]\fP format.
-.SS "[macros NAME] sections (server\-side only)"
-These sections contain variables that will be defined as RPM macros when generating the SRPM of the package being submitted.It is usually used to define the distribution suffix that will be used in package releases, such as "mdv2008.1".
-.SS "[users] section (server\-side only)"
-This section maps the usernames found in svn to their real names and e\-mails. It is used when generating the changelog based on commits in svn and by \fBauthoremail\fP. Example: \fBjoe = Joe User <joeuser at host.com>\fP.
-
-This section can be used on client\-side too, but will have no effect in generated changelogs on the server\-side.
-.SS "[helper] section"
-.IP "\fBcreate\-srpm = PATH\fP"
-The path of the script that will be run through ssh on the submit host when running \fBrepsys submit\fP.
-.IP "\fBupload\-srpm = PATH\fP"
-(server\-side only) Path of the script that will be called after the generated SRPM is copied to its target location (see target sections above) and target scripts are run.
-.IP "\fBrpmbuild = COMMAND\fP"
-The command used to call rpmbuild. Note that build options (such as \-bs) are supplied by repsys.
-.SS "[log] section"
-.IP "\fBoldurl = URL\fP"
-The URL of a directory structure that will contain old changelogs of packages that will be appended to the changelog being generated by \fBrpmlog\fP or \fBgetsrpm \-l\fP.
-.IP "\fBmerge\-spec = yes/no\fP"
-If enabled, changelogs generated by \fBrepsys\fP will have the contents of the %changelog found in the .spec file of the package appended.
-.IP "\fBsort = yes/no\fP"
-If enabled, the changelog will be resorted after its generation. It is useful when changelogs found in \fBoldurl\fP or in the .spec's %changelog section are newer than those generated by SVN.
-.IP "\fBrevision\-offset = REVISION\-NUMBER\fP"
-The base revision used to generated changelogs. As in \fBsvn log -r REVISION\-OFFSET:HEAD URL\fP.
-.IP "\fBignore\-string = STRING\fP"
-Mark used to hide log messages. When it appears at the beginning of the log message, the whole changeset log is hidden. When it is found in the middle of a string, only the line will not be shown.
-.IP "\fBunignore\-string = STRING\fP"
-The complement of the previous option. When this token is found, only those lines containg this mark will be shown. It is intended to be used in very long log messages.
-.SS "[template] section"
-.IP "\fBpath = PATH\fP"
-The path of the template used to generate the changelog from svn commits.
-.SS "[srpm] section"
-.IP "\fBrun-prep = yes/no\fP"
-Repsys can check for the presence of a file named \fBMakefile\fP in the top directory of the package and run \fBmake prep-srpm\fP so that it can generate the actual files that must be distributed in in the srpm. This option enables this feature. (Note: the command is expected to run in an restricted environment, the Makefile must use only minimal funcionalities.)
-.SH "ENVIRONMENT VARIABLES"
-.PP
-.IP "\fBREPSYS_CONF\fP"
-Sets the configuration file to be read by \fBrepsys\fP
-.SH "FILES"
-.nf
-~/.repsys/config
-/etc/repsys.conf
-/usr/share/repsys/
-/usr/share/doc/repsys/
-.fi
-.SH "BUGS"
-See the list of bugs at http://qa.mandriva.com/buglist.cgi?quicksearch=repsys
-.SH "SEE ALSO"
-mdvsys(1), svn(1), ssh\-agent(1)
-
-.nf
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem/Quickstart
-.fi
-.SH "AUTHOR"
-.nf
-repsys was originally written by Gustavo Niemeyer <gustavo at niemeyer.net>
-for the Conectiva Linux distribution. Currently it is being mantained by
-Mandriva contributors and employees.
-.fi
Deleted: build_system/mgarepo/trunk/repsys.conf
===================================================================
--- build_system/mgarepo/trunk/repsys.conf 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/repsys.conf 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,20 +0,0 @@
-# see man 8 repsys for a description on configuration options
-[global]
-repository = svn+ssh://svn.mageia.org/svn/packages/
-trunk-dir = cauldron/
-
-## uncomment it in case you don't have a account in the Mageia build system:
-#mirror = http://svn.mageia.org/svn/packages/cauldron/
-use-binaries-repository = yes
-binaries-repository = svn+ssh://svn.mageia.org/svn/binrepos
-
-[log]
-oldurl = svn+ssh://svn.mageia.org/svn/packages/misc
-
-[helper]
-create-srpm = /usr/share/repsys/create-srpm
-upload-srpm = /usr/local/bin/youri.devel
-
-[submit]
-host = pkgsubmit.mageia.org
-default = Cauldron
Modified: build_system/mgarepo/trunk/setup.cfg
===================================================================
--- build_system/mgarepo/trunk/setup.cfg 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/setup.cfg 2011-01-11 00:35:59 UTC (rev 265)
@@ -1,3 +1,3 @@
[bdist_rpm]
-doc_files = repsys.conf README README.LDAP CHANGES
+doc_files = mgarepo.conf README README.LDAP CHANGES
Modified: build_system/mgarepo/trunk/setup.py
===================================================================
--- build_system/mgarepo/trunk/setup.py 2011-01-10 15:26:33 UTC (rev 264)
+++ build_system/mgarepo/trunk/setup.py 2011-01-11 00:35:59 UTC (rev 265)
@@ -4,30 +4,30 @@
import re
verpat = re.compile("VERSION *= *\"(.*)\"")
-data = open("repsys").read()
+data = open("mgarepo").read()
m = verpat.search(data)
if not m:
sys.exit("error: can't find VERSION")
VERSION = m.group(1)
-setup(name="repsys",
+setup(name="mgarepo",
version = VERSION,
- description = "Tools for Mandriva Linux repository access and management",
+ description = "Tools for Mageia repository access and management",
author = "Gustavo Niemeyer",
author_email = "gustavo at niemeyer.net",
url = "http://qa.mandriva.com/twiki/bin/view/Main/RepositorySystem",
license = "GPL",
- long_description = """Tools for Mandriva Linux repository access and management.""",
- packages = ["RepSys", "RepSys.cgi", "RepSys.commands",
- "RepSys.plugins"],
- scripts = ["repsys", "repsys-ssh"],
+ long_description = """Tools for Mageia repository access and management, based on repsys.""",
+ packages = ["MgaRepo", "MgaRepo.cgi", "MgaRepo.commands",
+ "MgaRepo.plugins"],
+ scripts = ["mgarepo", "mgarepo-ssh"],
data_files = [
- ("/usr/share/repsys/",
+ ("/usr/share/mgarepo/",
["default.chlog",
"revno.chlog",
"create-srpm"]),
- ("/etc/", ["repsys.conf"]),
- ("share/man/man8/", ["repsys.8"])]
+ ("/etc/", ["mgarepo.conf"]),
+ ("share/man/man8/", ["mgarepo.8"])]
)
# vim:ts=4:sw=4:et
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110111/ae156efc/attachment-0001.html>
More information about the Mageia-sysadm
mailing list