Changeset 1666


Ignore:
Timestamp:
Sep 27, 2007, 2:25:24 PM (12 years ago)
Author:
bruno
Message:
  • Remove useless .keep file
  • remove temporary.iso name remaining and suppress a warning in log trying to remove it in the tmpdir
Location:
branches/2.2.5
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-tools.c

    r1661 r1666  
    768768            if (bkpinfo->call_before_iso[0] == '\0') {
    769769            sprintf(bkpinfo->call_before_iso,
    770                         "%s -o %s/temporary.iso . 2>> _ERR_",
     770                        "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_",
    771771                        mondo_mkisofs_sz, bkpinfo->tmpdir);
    772772                } else {
    773773                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
    774774                sprintf (bkpinfo->call_before_iso,
    775                                     "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
     775                                    "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )",
    776776                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
    777777            }
    778778            log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
    779779            sprintf(bkpinfo->call_make_iso,
    780                     "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
     780                    "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
    781781                    cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
    782782                    extra_cdrom_params, bkpinfo->media_device,
     
    887887    if (retval) {
    888888        fprintf(stderr, "Type 'man mondoarchive' for help.\n");
    889     }
    890     sprintf(tmp, "%s", MONDO_TMPISOS);  /* added #define 22 apr 2002 */
    891     if (does_file_exist(tmp)) {
    892         unlink(tmp);
    893889    }
    894890    if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
  • branches/2.2.5/mondo/src/common/my-stuff.h

    r1661 r1666  
    351351 * The stub name of the temporary ISO image to create, burn, and remove.
    352352 */
    353 #define MONDO_TMPISOS "/temporary.iso"
     353#define MONDO_TMPISOS "temporary.iso"
    354354
    355355/**
Note: See TracChangeset for help on using the changeset viewer.