To avoid confusion, Mageia repsys fork is being renamed to mgarepo

42 files changed, 22 insertions, 11 deletions

diff --git a/CHANGES b/CHANGES
index 587b33d..6506054 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
-* Development
+* 1.9.2-binrepo
+- add .xz files in binrepo
+
+* 1.9.1-binrepo
+- fix problem with python threads on 2010.1
+
+* 1.9-binrepo
 - added support to "binary repository"
 - added new commands upload, up and del to help handling tarballs in the
   binaries repository
diff --git a/RepSys/ConfigParser.py b/RepSys/ConfigParser.py
index 3b4e213..3b4e213 100755..100644
--- a/RepSys/ConfigParser.py
+++ b/RepSys/ConfigParser.py
diff --git a/RepSys/__init__.py b/RepSys/__init__.py
index b0df184..b0df184 100755..100644
--- a/RepSys/__init__.py
+++ b/RepSys/__init__.py
diff --git a/RepSys/binrepo.py b/RepSys/binrepo.py
index edca9a4..1298e35 100755..100644
--- a/RepSys/binrepo.py
+++ b/RepSys/binrepo.py
@@ -107,7 +107,7 @@ def is_binary(path):
     raw = config.get("binrepo", "upload-match",
             "\.(7z|Z|bin|bz2|cpio|db|deb|egg|gem|gz|jar|jisp|lzma|"\
                "pdf|pgn\\.gz|pk3|rpm|rpm|run|sdz|smzip|tar|tbz|"\
-               "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|zip)$")
+               "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|xz|zip)$")
     maxsize = config.getint("binrepo", "upload-match-size", "1048576") # 1MiB
     expr = re.compile(raw)
     name = os.path.basename(path)
@@ -297,6 +297,7 @@ def update_sources(topdir, added=[], removed=[]):
 def update_sources_threaded(*args, **kwargs):
     t = threading.Thread(target=update_sources, args=args, kwargs=kwargs)
     t.start()
+    t.join()
     return t
 
 def upload(path, message=None):
diff --git a/RepSys/cgi/__init__.py b/RepSys/cgi/__init__.py
index e69de29..e69de29 100755..100644
--- a/RepSys/cgi/__init__.py
+++ b/RepSys/cgi/__init__.py
diff --git a/RepSys/cgi/soapserver.py b/RepSys/cgi/soapserver.py
index 2f6b751..2f6b751 100755..100644
--- a/RepSys/cgi/soapserver.py
+++ b/RepSys/cgi/soapserver.py
diff --git a/RepSys/cgi/submit.py b/RepSys/cgi/submit.py
index 10f7cb2..10f7cb2 100755..100644
--- a/RepSys/cgi/submit.py
+++ b/RepSys/cgi/submit.py
diff --git a/RepSys/cgi/xmlrpcserver.py b/RepSys/cgi/xmlrpcserver.py
index e0851d1..e0851d1 100755..100644
--- a/RepSys/cgi/xmlrpcserver.py
+++ b/RepSys/cgi/xmlrpcserver.py
diff --git a/RepSys/cgiutil.py b/RepSys/cgiutil.py
index 35c5efb..35c5efb 100755..100644
--- a/RepSys/cgiutil.py
+++ b/RepSys/cgiutil.py
diff --git a/RepSys/command.py b/RepSys/command.py
index 63f2df9..63f2df9 100755..100644
--- a/RepSys/command.py
+++ b/RepSys/command.py
diff --git a/RepSys/commands/__init__.py b/RepSys/commands/__init__.py
index e69de29..e69de29 100755..100644
--- a/RepSys/commands/__init__.py
+++ b/RepSys/commands/__init__.py
diff --git a/RepSys/commands/authoremail.py b/RepSys/commands/authoremail.py
index f5b8b70..f5b8b70 100755..100644
--- a/RepSys/commands/authoremail.py
+++ b/RepSys/commands/authoremail.py
diff --git a/RepSys/commands/changed.py b/RepSys/commands/changed.py
index 66c1a53..66c1a53 100755..100644
--- a/RepSys/commands/changed.py
+++ b/RepSys/commands/changed.py
diff --git a/RepSys/commands/ci.py b/RepSys/commands/ci.py
index 8d373b5..8d373b5 100755..100644
--- a/RepSys/commands/ci.py
+++ b/RepSys/commands/ci.py
diff --git a/RepSys/commands/co.py b/RepSys/commands/co.py
index 81e4140..81e4140 100755..100644
--- a/RepSys/commands/co.py
+++ b/RepSys/commands/co.py
diff --git a/RepSys/commands/create.py b/RepSys/commands/create.py
index ded8abe..ded8abe 100755..100644
--- a/RepSys/commands/create.py
+++ b/RepSys/commands/create.py
diff --git a/RepSys/commands/del.py b/RepSys/commands/del.py
index 2c6902e..2c6902e 100755..100644
--- a/RepSys/commands/del.py
+++ b/RepSys/commands/del.py
diff --git a/RepSys/commands/editlog.py b/RepSys/commands/editlog.py
index 9d1afc5..9d1afc5 100755..100644
--- a/RepSys/commands/editlog.py
+++ b/RepSys/commands/editlog.py
diff --git a/RepSys/commands/getspec.py b/RepSys/commands/getspec.py
index a357ef9..a357ef9 100755..100644
--- a/RepSys/commands/getspec.py
+++ b/RepSys/commands/getspec.py
diff --git a/RepSys/commands/getsrpm.py b/RepSys/commands/getsrpm.py
index 1767bb7..1767bb7 100755..100644
--- a/RepSys/commands/getsrpm.py
+++ b/RepSys/commands/getsrpm.py
diff --git a/RepSys/commands/log.py b/RepSys/commands/log.py
index 28df27d..28df27d 100755..100644
--- a/RepSys/commands/log.py
+++ b/RepSys/commands/log.py
diff --git a/RepSys/commands/markrelease.py b/RepSys/commands/markrelease.py
index 057cf1d..057cf1d 100755..100644
--- a/RepSys/commands/markrelease.py
+++ b/RepSys/commands/markrelease.py
diff --git a/RepSys/commands/patchspec.py b/RepSys/commands/patchspec.py
index 9a4881b..9a4881b 100755..100644
--- a/RepSys/commands/patchspec.py
+++ b/RepSys/commands/patchspec.py
diff --git a/RepSys/commands/putsrpm.py b/RepSys/commands/putsrpm.py
index efe1a15..efe1a15 100755..100644
--- a/RepSys/commands/putsrpm.py
+++ b/RepSys/commands/putsrpm.py
diff --git a/RepSys/commands/rpmlog.py b/RepSys/commands/rpmlog.py
index 238b675..238b675 100755..100644
--- a/RepSys/commands/rpmlog.py
+++ b/RepSys/commands/rpmlog.py
diff --git a/RepSys/commands/submit.py b/RepSys/commands/submit.py
index 2924329..2924329 100755..100644
--- a/RepSys/commands/submit.py
+++ b/RepSys/commands/submit.py
diff --git a/RepSys/commands/switch.py b/RepSys/commands/switch.py
index 998ae2c..998ae2c 100755..100644
--- a/RepSys/commands/switch.py
+++ b/RepSys/commands/switch.py
diff --git a/RepSys/commands/sync.py b/RepSys/commands/sync.py
index b4bdaba..b4bdaba 100755..100644
--- a/RepSys/commands/sync.py
+++ b/RepSys/commands/sync.py
diff --git a/RepSys/commands/up.py b/RepSys/commands/up.py
index 02a1a9f..02a1a9f 100755..100644
--- a/RepSys/commands/up.py
+++ b/RepSys/commands/up.py
diff --git a/RepSys/commands/upload.py b/RepSys/commands/upload.py
index 6af50ea..6af50ea 100755..100644
--- a/RepSys/commands/upload.py
+++ b/RepSys/commands/upload.py
diff --git a/RepSys/layout.py b/RepSys/layout.py
index fb50acd..fb50acd 100755..100644
--- a/RepSys/layout.py
+++ b/RepSys/layout.py
diff --git a/RepSys/log.py b/RepSys/log.py
index 6cb9da1..6cb9da1 100755..100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
diff --git a/RepSys/mirror.py b/RepSys/mirror.py
index 94720cc..94720cc 100755..100644
--- a/RepSys/mirror.py
+++ b/RepSys/mirror.py
diff --git a/RepSys/plugins/__init__.py b/RepSys/plugins/__init__.py
index e4f4e08..e4f4e08 100755..100644
--- a/RepSys/plugins/__init__.py
+++ b/RepSys/plugins/__init__.py
diff --git a/RepSys/plugins/ldapusers.py b/RepSys/plugins/ldapusers.py
index e56371d..e56371d 100755..100644
--- a/RepSys/plugins/ldapusers.py
+++ b/RepSys/plugins/ldapusers.py
diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py
index bff744b..bff744b 100755..100644
--- a/RepSys/rpmutil.py
+++ b/RepSys/rpmutil.py
diff --git a/RepSys/simplerpm.py b/RepSys/simplerpm.py
index d448c5f..d448c5f 100755..100644
--- a/RepSys/simplerpm.py
+++ b/RepSys/simplerpm.py
diff --git a/RepSys/svn.py b/RepSys/svn.py
index d6be524..d6be524 100755..100644
--- a/RepSys/svn.py
+++ b/RepSys/svn.py
diff --git a/RepSys/util.py b/RepSys/util.py
index 84840b9..84840b9 100755..100644
--- a/RepSys/util.py
+++ b/RepSys/util.py
diff --git a/create-srpm b/create-srpm
index 373b072..08d4400 100755
--- a/create-srpm
+++ b/create-srpm
@@ -56,6 +56,8 @@ class CmdIface:
                          svnlog=1,
                          revname=1,
                          scripts=target.scripts, 
+                         use_binrepo = True,
+                         binrepo_check = False,
                          macros=target.macros)
                 uploadsrpms.extend(targetsrpms)
             uploadcmd = get_helper("upload-srpm")
diff --git a/repsys b/repsys
index e68f3a8..a3113f1 100755
--- a/repsys
+++ b/repsys
@@ -4,7 +4,7 @@ from RepSys.command import *
 import getopt
 import sys
 
-VERSION="1.9-binrepo"
+VERSION="1.9.2-binrepo"
 
 HELP = """\
 Usage: repsys COMMAND [COMMAND ARGUMENTS]
diff --git a/repsys.conf b/repsys.conf
index 45cda90..fb62e4b 100644
--- a/repsys.conf
+++ b/repsys.conf
@@ -1,18 +1,20 @@
 # see man 8 repsys for a description on configuration options
 [global]
-repository = svn+ssh://svn.mandriva.com/svn/packages/
-## uncomment it in case you don't have a account in the Mandriva cluster:
-#mirror = http://svn.mandriva.com/svn/packages/cooker/
-#use-binaries-repository = yes
-#binaries-repository = svn.mandriva.com:/tarballs/
+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.mandriva.com/svn/packages/misc
+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 = kenobi.mandriva.com
-default = Cooker
+host = pkgsubmit.mageia.org
+default = Cauldron