diff options
| author | Jesse Keating <jkeating@redhat.com> | 2010-07-27 11:20:52 -0700 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2010-07-27 11:20:52 -0700 |
| commit | 68d0c93b40d4e53bc3597aa52bf8ebdda728566a (patch) | |
| tree | 81c30a081fef6043dac77668dea9a5dcdb3da80d | |
| parent | d01e92fb7798263f7c4b768c272d694feeea5323 (diff) | |
| download | fedora-packager-68d0c93b40d4e53bc3597aa52bf8ebdda728566a.tar.gz fedora-packager-68d0c93b40d4e53bc3597aa52bf8ebdda728566a.tar.xz fedora-packager-68d0c93b40d4e53bc3597aa52bf8ebdda728566a.zip | |
Fix cloning with branches for our new branch scheme
| -rw-r--r-- | src/pyfedpkg/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 9c69d75..2fd1e6f 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -36,7 +36,7 @@ ANONGITURL = 'git://pkgs.fedoraproject.org/%(module)s' UPLOADEXTS = ['tar', 'gz', 'bz2', 'lzma', 'xz', 'Z', 'zip', 'tff', 'bin', 'tbz', 'tbz2', 'tlz', 'txz', 'pdf', 'rpm', 'jar', 'war', 'db', 'cpio', 'jisp', 'egg', 'gem'] -BRANCHFILTER = 'FC?-\d\d?|master' +BRANCHFILTER = 'f\d\d\/master|master|el\d\/master|olpc\d\/master' # Define our own error class class FedpkgError(Exception): @@ -322,10 +322,11 @@ def clone_with_dirs(module, user, path=os.getcwd()): for branch in branches: try: # Make a local clone for our branch - top_git.clone("--branch", branch, repo_path, branch) + top_git.clone("--branch", branch, repo_path, + branch.split('/master')[0]) # Set the origin correctly - branch_path = os.path.join(top_path, branch) + branch_path = os.path.join(top_path, branch.split('/master')[0]) branch_git = git.Git(branch_path) branch_git.config("--replace-all", "remote.origin.url", GITBASEURL % {'user': user, 'module': module}) |