Skip to content

Commit e079f3e

Browse files
committed
1 parent 1268024 commit e079f3e

File tree

5 files changed

+15
-28
lines changed

5 files changed

+15
-28
lines changed

Diff for: app/src/corelib/ddevicediskinfo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ bool DDeviceDiskInfoPrivate::openDataStream(int index)
303303

304304
if (currentMode == DDiskInfo::Read) {
305305
const QString &executer = Helper::getPartcloneExecuter(part);
306-
process->start(QStringLiteral("%1 -s %2 -o - -c -z %3 -L /tmp/partclone.log").arg(executer).arg(part.filePath()).arg(Global::bufferSize), QIODevice::ReadOnly);
306+
process->start(QStringLiteral("%1 -s %2 -o - -c -z %3 -L /var/log/partclone.log").arg(executer).arg(part.filePath()).arg(Global::bufferSize), QIODevice::ReadOnly);
307307
} else {
308-
process->start(QStringLiteral("partclone.restore -s - -o %2 -z %3 -L /tmp/partclone.log").arg(part.filePath()).arg(Global::bufferSize));
308+
process->start(QStringLiteral("partclone.restore -s - -o %2 -z %3 -L /var/log/partclone.log").arg(part.filePath()).arg(Global::bufferSize));
309309
}
310310

311311
break;

Diff for: app/src/corelib/helper.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ int Helper::processExec(QProcess *process, const QString &command, int timeout,
100100
if (process->state() != QProcess::NotRunning) {
101101
dCDebug("The \"%s\" timeout, timeout: %d", qPrintable(command), timeout);
102102

103+
// QT Bug,某种情况下(未知) QProcess::state 返回的状态有误,导致进程已退出却未能正确获取到其当前状态
104+
// 因此,额外通过系统文件判断进程是否还存在
103105
if (QFile::exists(QString("/proc/%1").arg(process->pid()))) {
104106
process->terminate();
105107
process->waitForFinished();
@@ -331,7 +333,7 @@ bool Helper::getPartitionSizeInfo(const QString &partDevice, qint64 *used, qint6
331333

332334
return true;
333335
} else {
334-
process.start(QString("%1 -s %2 -c -q -C -L /tmp/partclone.log").arg(getPartcloneExecuter(DDevicePartInfo(partDevice))).arg(partDevice));
336+
process.start(QString("%1 -s %2 -c -q -C -L /var/log/partclone.log").arg(getPartcloneExecuter(DDevicePartInfo(partDevice))).arg(partDevice));
335337
process.setStandardOutputFile("/dev/null");
336338
process.setReadChannel(QProcess::StandardError);
337339
process.waitForStarted();
@@ -501,9 +503,9 @@ QString Helper::temporaryMountDevice(const QString &device, const QString &name,
501503
return mount_point;
502504

503505
mount_point = "%1/.%2/mount/%3";
504-
const QStringList &tmp_paths = QStandardPaths::standardLocations(QStandardPaths::TempLocation);
506+
const QStringList &tmp_paths = QStandardPaths::standardLocations(QStandardPaths::RuntimeLocation);
505507

506-
mount_point = mount_point.arg(tmp_paths.isEmpty() ? "/tmp" : tmp_paths.first()).arg(qApp->applicationName()).arg(name);
508+
mount_point = mount_point.arg(tmp_paths.isEmpty() ? "/run/user/0" : tmp_paths.first()).arg(qApp->applicationName()).arg(name);
507509

508510
if (!QDir::current().mkpath(mount_point)) {
509511
dCError("mkpath \"%s\" failed", qPrintable(mount_point));

Diff for: app/src/corelib/helper.h

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ class Helper : public QObject
9999
static QString parseSerialUrl(const QString &urlString, QString *errorString = 0);
100100
static QString toSerialUrl(const QString &file);
101101

102+
static bool clearSymlink(const QString &path);
103+
102104
signals:
103105
void newWarning(const QString &message);
104106
void newError(const QString &message);

Diff for: app/src/fixboot/bootdoctor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ bool BootDoctor::fix(const QString &partDevice)
5555
}
5656

5757
{
58-
const QStringList &tmp_paths = QStandardPaths::standardLocations(QStandardPaths::TempLocation);
59-
const QString tmp_dir = (tmp_paths.isEmpty() ? "/tmp" : tmp_paths.first()) + "/.deepin-clone";
58+
const QString tmp_dir = "/var/cache/deepin-clone";
6059

6160
if (!QDir::current().mkpath(tmp_dir)) {
6261
dCError("mkpath \"%s\" failed", qPrintable(tmp_dir));

Diff for: app/src/main.cpp

+5-21
Original file line numberDiff line numberDiff line change
@@ -102,36 +102,20 @@ int main(int argc, char *argv[])
102102
ConsoleAppender *consoleAppender = new ConsoleAppender;
103103
consoleAppender->setFormat(logFormat);
104104

105-
RollingFileAppender *rollingFileAppender = new RollingFileAppender("/tmp/.deepin-clone.log");
105+
const QString log_file("/var/log/deepin-clone.log");
106+
107+
RollingFileAppender *rollingFileAppender = new RollingFileAppender(log_file);
106108
rollingFileAppender->setFormat(logFormat);
107109
rollingFileAppender->setLogFilesLimit(5);
108110
rollingFileAppender->setDatePattern(RollingFileAppender::DailyRollover);
109111

110-
logger->registerAppender(consoleAppender);
111112
logger->registerAppender(rollingFileAppender);
113+
logger->registerAppender(consoleAppender);
112114

113115
if (qEnvironmentVariableIsSet("PKEXEC_UID")) {
114116
const quint32 pkexec_uid = qgetenv("PKEXEC_UID").toUInt();
115-
const QDir user_home(getpwuid(pkexec_uid)->pw_dir);
116-
117-
QFile pam_file(user_home.absoluteFilePath(".pam_environment"));
118117

119-
if (pam_file.open(QIODevice::ReadOnly)) {
120-
while (!pam_file.atEnd()) {
121-
const QByteArray &line = pam_file.readLine().simplified();
122-
123-
if (line.startsWith("QT_SCALE_FACTOR")) {
124-
const QByteArrayList &list = line.split('=');
125-
126-
if (list.count() == 2) {
127-
qputenv("QT_SCALE_FACTOR", list.last());
128-
break;
129-
}
130-
}
131-
}
132-
133-
pam_file.close();
134-
}
118+
DApplication::customQtThemeConfigPathByUserHome(getpwuid(pkexec_uid)->pw_dir);
135119
}
136120

137121
DApplication::loadDXcbPlugin();

0 commit comments

Comments
 (0)