Commit 0c920815 authored by Aaron Wells's avatar Aaron Wells

Merge remote-tracking branch 'nzoss/master'

parents 39ff5e3e c908500e
......@@ -62,11 +62,11 @@ def send_bug_mail(bug_number, change_url, project, commit, submitter, branch, gi
to_address = bug_number + TO_ADDRESS_SUFFIX
gitorious_url = 'http://gitorious.org/mahara/%s/commit/%s' % (project, commit)
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, commit)
body = '''Reviewed: %s
Committed: %s
Submitter: %s
Branch: %s\n''' % (change_url, gitorious_url, submitter, branch)
Branch: %s\n''' % (change_url, remote_url, submitter, branch)
msg = MIMEText(body + '\n' + git_log)
msg['Subject'] = 'A change has been merged'
......@@ -84,7 +84,7 @@ def append_commit(commits, document, project, full_commit_id, author, log):
revision = subprocess.Popen(['git', '--git-dir=' + BASE_DIR + '/git/' + project + '.git', 'rev-parse', '--short', full_commit_id], stdout=subprocess.PIPE).communicate()[0].strip()
gitorious_url = 'http://gitorious.org/mahara/%s/commit/%s' % (project, full_commit_id)
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, full_commit_id)
commit = document.createElement('commit')
commit_author = document.createElement('author')
......@@ -100,7 +100,7 @@ def append_commit(commits, document, project, full_commit_id, author, log):
commit.appendChild(commit_log)
commit_url = document.createElement('url')
commit_url.appendChild(document.createTextNode(gitorious_url))
commit_url.appendChild(document.createTextNode(remote_url))
commit.appendChild(commit_url)
commits.append(commit)
......@@ -131,7 +131,7 @@ def submit_to_cia(project, commit, branch, git_log):
generator_version = doc.createElement('version')
generator_version.appendChild(doc.createTextNode('1.0'))
generator_url = doc.createElement('url')
generator_url.appendChild(doc.createTextNode('http://gitorious.org/mahara/mahara-scripts/blobs/master/change-merged'))
generator_url.appendChild(doc.createTextNode('https://git.nzoss.org.nz/mahara/mahara-scripts/blobs/master/change-merged'))
generator.appendChild(generator_name)
generator.appendChild(generator_version)
generator.appendChild(generator_url)
......
......@@ -9,5 +9,5 @@ Package: custom-site-mahara-langpacks
Architecture: all
Depends: ${misc:Depends}, apache2, php5-cli, perl, bash, debconf, git-core, libhtml-tiny-perl, liblocale-po-perl, libwww-perl, bzr
Description: Mahara langpack repository scripts
Scripts to download mahara langpacks from gitorious, clean them up, and
Scripts to download mahara langpacks from git.nzoss.org.nz, clean them up, and
make them available for HTTP download.
......@@ -2,7 +2,7 @@ This package was debianized by Richard Hector <richard@catalyst.net.nz> on
Sat, 20 Nov 2010 18:38:57 +1300
It is incorporated into the same repository as the software itself, at
http://gitorious.org/mahara/mahara-scripts
https://git.nzoss.org.nz/mahara/mahara-scripts
Upstream Authors:
......
......@@ -57,7 +57,7 @@ def send_bug_mail(bug_number, change_url, project, commit, uploader, branch, git
to_address = bug_number + TO_ADDRESS_SUFFIX
gitorious_url = 'http://gitorious.org/mahara/%s/commit/%s' % (project, commit)
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, commit)
body = 'Patch for "%s" branch: %s\n' % (branch, change_url)
msg = MIMEText(body)
......
......@@ -85,7 +85,7 @@ pushd ${BUILDDIR}/mahara
# Main Mahara repo to pull from
#PUBLIC="git@gitorious.org:mahara/mahara.git"
#PUBLIC="git@git.nzoss.org.nz:mahara/mahara.git"
PUBLIC="git@github.com:MaharaProject/mahara.git"
echo "Cloning public repository ${PUBLIC} in ${BUILDDIR}/mahara"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment