[Bug 628181] New: Conflicts in /home/admin/bin

["sysadmin" (bugzilla.gnome.org) <bugzilla gnome org>]

https://bugzilla.gnome.org/show_bug.cgi?id=628181
  sysadmin | Other | unspecified

           Summary: Conflicts in /home/admin/bin
    Classification: Infrastructure
           Product: sysadmin
           Version: unspecified
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: Normal
         Component: Other
        AssignedTo: sysadmin-maint gnome bugs
        ReportedBy: bugzilla-gnome vitters nl
         QAContact: sysadmin-maint gnome bugs
      GNOME target: ---
     GNOME version: ---


I'm playing with create-auth. Noticed the following conflict. This prevents me
from doing anything. As I don't understand Git much, I'm going to try and clean
all the changes.

# git diff
diff --cc copy-db.py
index 83a36d5,ac6b1ef..0000000
--- a/copy-db.py
+++ b/copy-db.py
@@@ -153,17 -121,10 +153,22 @@@ for db in dbs
          hotcopy.wait()
      else:
          verbose("Backing up %s via mysqldump" % db)
 -        outfilename = os.path.join('/var/lib/mysql-backup', db_filename +
".dump.gz")
 +        outfilename = os.path.join(backup_dir, db_filename + ".dump.gz")
          outfilename_tmp = outfilename + ".tmp"
++<<<<<<< HEAD:copy-db.py
 +
 +        # Add a bit of error checking before freaking out
 +        if not os.path.exists(backup_dir):
 +            sys.stderr.write("ERROR: '%s' does not exist to backup files
into\n" % backup_dir)
 +            sys.exit(1)
 +        if not os.access(backup_dir, os.W_OK):
 +            sys.stderr.write("ERROR: '%s' is not writable\n" % backup_dir)
 +            sys.exit(1)
 +
++=======
+         # Create the backup directory if it doesn't exist
+         os.makedirs(os.path.dirname(outfilename))
++>>>>>>> Create the mysql backup directory before opening the file in
copy-db.py:copy-db.py
          outfile = open(outfilename_tmp, "w")
          dump = subprocess.Popen(['mysqldump',
                                   '--single-transaction',

-- 
Configure bugmail: https://bugzilla.gnome.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the QA contact of the bug.
You are watching the assignee of the bug.