← Back to branch summary

~ubuntu-branches/debian/sid/nautilus-dropbox/sid

« back to all changes in this revision

Viewing changes to .pc/non-interactive-update.patch/dropbox.in

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin, Unit 193, Chow Loong Jin
  • Date: 2014-09-14 16:36:05 UTC
  • Revision ID: package-import@ubuntu.com-20140914163605-jpg4hpiqmd2ixlg8
Tags: 1.6.2-2
http://bugs.debian.org/708606
http://bugs.debian.org/758037
[ Unit 193 ]
* [f412574] Add vrms reasons file. Closes: #708606

[ Chow Loong Jin ]
* [dcb4926] Disable global installation of dropbox (Closes: #758037)
* [a92d214] Refresh non-interactive-update.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/non-interactive-update.patch/dropbox.in
60
60
DOWNLOADING = u"Downloading Dropbox... %d%%"
61
61
UNPACKING = u"Unpacking Dropbox... %d%%"
62
62
 
63
 
PARENT_DIR = os.path.expanduser("/var/lib/dropbox")
 
63
PARENT_DIR = os.path.expanduser("~")
64
64
DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
65
65
DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
66
66
 
273
273
            if os.path.exists(filename) and not os.path.isdir(filename):
274
274
                os.unlink(filename)
275
275
            archive.extract(member, PARENT_DIR)
276
 
            os.lchown(filename, os.geteuid(), os.getegid())
277
276
            yield member.name, i, total_members
278
277
        archive.close()
279
278
 
1283
1282
 
1284
1283
        # install dropbox!!!
1285
1284
        try:
1286
 
            args = [ "pkexec", "dropbox" ]
1287
 
            if "http_proxy" in os.environ:
1288
 
                args.extend(["--http-proxy", os.environ["http_proxy"]])
1289
 
            if "https_proxy" in os.environ:
1290
 
                args.extend(["--https-proxy", os.environ["https_proxy"]])
1291
 
            args.append("update")
1292
 
            status = os.spawnvp(os.P_WAIT, "pkexec", args)
1293
 
            if status != 0:
1294
 
                console_print(u"The installation of Dropbox failed.")
1295
 
                return
 
1285
            download()
1296
1286
        except:
1297
1287
            traceback.print_exc()
1298
1288
        else: