|
|
@@ -51,17 +51,17 @@ int cleanup_pkg_failed=0, cleanup_conflictor_failed=0;
|
|
|
* Something went wrong and we're undoing.
|
|
|
*
|
|
|
* We have the following possible situations for non-conffiles:
|
|
|
- * <foo>.dpkg-tmp exists - in this case we want to remove
|
|
|
- * <foo> if it exists and replace it with <foo>.dpkg-tmp.
|
|
|
+ * «pathname».dpkg-tmp exists - in this case we want to remove
|
|
|
+ * «pathname» if it exists and replace it with «pathname».dpkg-tmp.
|
|
|
* This undoes the backup operation.
|
|
|
- * <foo>.dpkg-tmp does not exist - <foo> may be on the disk,
|
|
|
+ * «pathname».dpkg-tmp does not exist - «pathname» may be on the disk,
|
|
|
* as a new file which didn't fail, remove it if it is.
|
|
|
*
|
|
|
- * In both cases, we also make sure we delete <foo>.dpkg-new in
|
|
|
+ * In both cases, we also make sure we delete «pathname».dpkg-new in
|
|
|
* case that's still hanging around.
|
|
|
*
|
|
|
- * For conffiles, we simply delete <foo>.dpkg-new. For these,
|
|
|
- * <foo>.dpkg-tmp shouldn't exist, as we don't make a backup
|
|
|
+ * For conffiles, we simply delete «pathname».dpkg-new. For these,
|
|
|
+ * «pathname».dpkg-tmp shouldn't exist, as we don't make a backup
|
|
|
* at this stage. Just to be on the safe side, though, we don't
|
|
|
* look for it.
|
|
|
*/
|
|
|
@@ -77,8 +77,8 @@ void cu_installnew(int argc, void **argv) {
|
|
|
setupfnamevbs(namenode->name);
|
|
|
|
|
|
if (!(namenode->flags & fnnf_new_conff) && !lstat(fnametmpvb.buf,&stab)) {
|
|
|
- /* OK, <foo>.dpkg-tmp exists. Remove <foo> and
|
|
|
- * restore <foo>.dpkg-tmp ... */
|
|
|
+ /* OK, «pathname».dpkg-tmp exists. Remove «pathname» and
|
|
|
+ * restore «pathname».dpkg-tmp ... */
|
|
|
if (namenode->flags & fnnf_no_atomic_overwrite) {
|
|
|
/* If we can't do an atomic overwrite we have to delete first any
|
|
|
* link to the new version we may have created. */
|
|
|
@@ -92,8 +92,8 @@ void cu_installnew(int argc, void **argv) {
|
|
|
/* Either we can do an atomic restore, or we've made room: */
|
|
|
if (rename(fnametmpvb.buf,fnamevb.buf))
|
|
|
ohshite(_("unable to restore backup version of `%.250s'"),namenode->name);
|
|
|
- /* If <foo>.dpkg-tmp was still a hard link to <foo>, then the atomic
|
|
|
- * rename did nothing, so we make sure to remove the backup. */
|
|
|
+ /* If «pathname».dpkg-tmp was still a hard link to «pathname», then the
|
|
|
+ * atomic rename did nothing, so we make sure to remove the backup. */
|
|
|
else if (unlink(fnametmpvb.buf) && errno != ENOENT)
|
|
|
ohshite(_("unable to remove backup copy of '%.250s'"), namenode->name);
|
|
|
} else if (namenode->flags & fnnf_placed_on_disk) {
|
|
|
@@ -104,7 +104,7 @@ void cu_installnew(int argc, void **argv) {
|
|
|
} else {
|
|
|
debug(dbg_eachfiledetail,"cu_installnew not restoring");
|
|
|
}
|
|
|
- /* Whatever, we delete <foo>.dpkg-new now, if it still exists. */
|
|
|
+ /* Whatever, we delete «pathname».dpkg-new now, if it still exists. */
|
|
|
if (secure_remove(fnamenewvb.buf) && errno != ENOENT && errno != ENOTDIR)
|
|
|
ohshite(_("unable to remove newly-extracted version of `%.250s'"),namenode->name);
|
|
|
|