chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-repos-server: make _tmp
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 0a5de292378470888b334e3d5dd3cf9785a8112d..50c45d7a4168045b6cc4e43a6ea557012bafd488 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-448,11
+448,12
@@
our %defcfg = ('dgit.default.distro' => 'debian',
'dgit.default.username' => '',
'dgit.default.archive-query-default-component' => 'main',
'dgit.default.ssh' => 'ssh',
'dgit.default.username' => '',
'dgit.default.archive-query-default-component' => 'main',
'dgit.default.ssh' => 'ssh',
+ 'dgit-distro.debian.git-user' => 'dgit',
'dgit-distro.debian.git-host' => 'git.debian.org',
'dgit-distro.debian.git-proto' => 'git+ssh://',
'dgit-distro.debian.git-host' => 'git.debian.org',
'dgit-distro.debian.git-proto' => 'git+ssh://',
- 'dgit-distro.debian.git-path' => '/
git/dgit-repos/repos
',
- 'dgit-distro.debian.git-check' => '
ssh-cmd
',
- 'dgit-distro.debian.git-create' => '
ssh-cmd
',
+ 'dgit-distro.debian.git-path' => '/
dgit-repos/
',
+ 'dgit-distro.debian.git-check' => '
true
',
+ 'dgit-distro.debian.git-create' => '
true
',
'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
@@
-1434,24
+1435,21
@@
sub dopush () {
if (!check_for_git()) {
create_remote_git_repo();
}
if (!check_for_git()) {
create_remote_git_repo();
}
- runcmd_ordryrun @git, qw(push),access_giturl(),
"HEAD:".rrref();
-
runcmd_ordryrun @git, qw(push),access_giturl(),
"refs/tags/$tag";
+ runcmd_ordryrun @git, qw(push),access_giturl(),
+
"HEAD:".rrref(),
"refs/tags/$tag";
runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
- if (!$we_are_responder) {
- if (act_local()) {
- rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
- } else {
- progress "[new .dsc left in $dscpath.tmp]";
- }
- }
-
if ($we_are_responder) {
my $dryrunsuffix = act_local() ? "" : ".tmp";
responder_receive_files('signed-dsc-changes',
"$dscpath$dryrunsuffix",
"$changesfile$dryrunsuffix");
} else {
if ($we_are_responder) {
my $dryrunsuffix = act_local() ? "" : ".tmp";
responder_receive_files('signed-dsc-changes',
"$dscpath$dryrunsuffix",
"$changesfile$dryrunsuffix");
} else {
+ if (act_local()) {
+ rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
+ } else {
+ progress "[new .dsc left in $dscpath.tmp]";
+ }
sign_changes $changesfile;
}
sign_changes $changesfile;
}