From ebf148d99e2dab6135794149553c193abe4e675d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 18 Oct 2026 00:30:27 +0000 Subject: Part four: we delete all the snapshots after set-install Except the snapshot corresponding to the new live db, of course. Also, in order to accommodate snapshots without risking name conflicts, the real name of set foobar isn't .foobar:XXXXXX anymore, but .real.foobar:XXXXXX Now the automatic upgrade in case of major bump is complete. Next comes testing and debugging. --- src/repo/s6rc_repo_moveservices.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/repo/s6rc_repo_moveservices.c') diff --git a/src/repo/s6rc_repo_moveservices.c b/src/repo/s6rc_repo_moveservices.c index 5d0b5d1..88e1fb2 100644 --- a/src/repo/s6rc_repo_moveservices.c +++ b/src/repo/s6rc_repo_moveservices.c @@ -40,27 +40,27 @@ int s6rc_repo_moveservices (char const *repo, char const *set, s6rc_repo_sv cons if (access(newfn, F_OK) == 0) { if (verbosity >= 2) - strerr_warni8x("service ", storage + services[i].pos, " already existed in rxset ", s6rc_repo_rxnames[newrx], " of set ", set, " in repository ", repo) ; + strerr_warni("service ", storage + services[i].pos, " already existed in rxset ", s6rc_repo_rxnames[newrx], " of set ", set, " in repository ", repo) ; } else if (errno != ENOENT) { - strerr_warnfu2sys("access ", newfn) ; + strerr_warnfusys("access ", newfn) ; return 0 ; } if (rename(oldfn, newfn) == -1) { - strerr_warnfu4sys("rename ", oldfn, " to ", newfn) ; + strerr_warnfusys("rename ", oldfn, " to ", newfn) ; return 0 ; } if (verbosity >= 4) { - strerr_warnt10x("repository ", repo, ", set ", set, ", from rxset ", s6rc_repo_rxnames[services[i].rx], " to rxset ", s6rc_repo_rxnames[newrx], ": successfully moved service ", storage + services[i].pos) ; + strerr_warnt("repository ", repo, ", set ", set, ", from rxset ", s6rc_repo_rxnames[services[i].rx], " to rxset ", s6rc_repo_rxnames[newrx], ": successfully moved service ", storage + services[i].pos) ; } } if (n) { memcpy(oldfn + repolen + 10 + setlen, ".stamp", 7) ; - if (!touch(oldfn)) strerr_warnwu2sys("touch ", oldfn) ; + if (!touch(oldfn)) strerr_warnwusys("touch ", oldfn) ; } return 1 ; } -- cgit v1.3.1