Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-network-utils for
openSUSE:Factory checked in at 2022-01-31 22:56:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-network-utils (Old)
and /work/SRC/openSUSE:Factory/.deepin-network-utils.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-network-utils"
Mon Jan 31 22:56:50 2022 rev:5 rq:950171 version:5.4.13
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-network-utils/deepin-network-utils.changes
2021-08-16 10:14:11.274910209 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-network-utils.new.1898/deepin-network-utils.changes
2022-01-31 22:57:10.833638680 +0100
@@ -1,0 +2,13 @@
+Thu Dec 16 14:41:56 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 5.4.13
+ * Fix a bug
+
+-------------------------------------------------------------------
+Tue Nov 9 02:47:42 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 5.4.12
+ * Change interface name for LAN
+ * Fix bug for DSL
+
+-------------------------------------------------------------------
Old:
----
dde-network-utils-5.4.9.tar.gz
New:
----
dde-network-utils-5.4.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-network-utils.spec ++++++
--- /var/tmp/diff_new_pack.28OiJw/_old 2022-01-31 22:57:11.329635340 +0100
+++ /var/tmp/diff_new_pack.28OiJw/_new 2022-01-31 22:57:11.337635286 +0100
@@ -20,7 +20,7 @@
%define sover 1
Name: deepin-network-utils
-Version: 5.4.9
+Version: 5.4.13
Release: 0
License: GPL-3.0+
Summary: Deepin Network Utils
@@ -77,8 +77,11 @@
%qmake5_install
%find_lang %{_name} --with-qt
-%post -n lib%{_name}%{sover} -p /sbin/ldconfig
-%postun -n lib%{_name}%{sover} -p /sbin/ldconfig
+%post -n lib%{_name}%{sover}
+/sbin/ldconfig
+
+%postun -n lib%{_name}%{sover}
+/sbin/ldconfig
# Please do not drop main package, the language package forcedly depends the
main package
%files
++++++ dde-network-utils-5.4.9.tar.gz -> dde-network-utils-5.4.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.9/dde-network-utils/networkdevice.cpp
new/dde-network-utils-5.4.13/dde-network-utils/networkdevice.cpp
--- old/dde-network-utils-5.4.9/dde-network-utils/networkdevice.cpp
2021-05-18 14:54:01.000000000 +0200
+++ new/dde-network-utils-5.4.13/dde-network-utils/networkdevice.cpp
2021-09-02 08:36:07.000000000 +0200
@@ -201,6 +201,11 @@
return clonedAdr.isEmpty() ? hwAdr : clonedAdr;
}
+const QString NetworkDevice::interfaceName() const
+{
+ return m_deviceInfo.value("Interface").toString();
+}
+
void NetworkDevice::updateDeviceInfo(const QJsonObject &devInfo)
{
m_deviceInfo = devInfo;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.9/dde-network-utils/networkdevice.h
new/dde-network-utils-5.4.13/dde-network-utils/networkdevice.h
--- old/dde-network-utils-5.4.9/dde-network-utils/networkdevice.h
2021-05-18 14:54:01.000000000 +0200
+++ new/dde-network-utils-5.4.13/dde-network-utils/networkdevice.h
2021-09-02 08:36:07.000000000 +0200
@@ -80,6 +80,7 @@
const QString path() const;
const QString realHwAdr() const;
const QString usingHwAdr() const;
+ const QString interfaceName() const;
Q_SIGNALS:
void removed() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.9/dde-network-utils/networkmodel.cpp
new/dde-network-utils-5.4.13/dde-network-utils/networkmodel.cpp
--- old/dde-network-utils-5.4.9/dde-network-utils/networkmodel.cpp
2021-05-18 14:54:01.000000000 +0200
+++ new/dde-network-utils-5.4.13/dde-network-utils/networkmodel.cpp
2021-09-02 08:36:07.000000000 +0200
@@ -329,6 +329,9 @@
QMap<QString, QList<QJsonObject>> commonConnections;
QMap<QString, QMap<QString, QList<QJsonObject>>> deviceConnections;
+ QMap<QString, QList<QJsonObject>> wiredCommonConnections;
+ QMap<QString, QMap<QString, QList<QJsonObject>>> wiredDeviceConnections;
+
// ??????????????? connection
const QJsonObject connsObject =
QJsonDocument::fromJson(conns.toUtf8()).object();
for (auto it(connsObject.constBegin()); it != connsObject.constEnd();
++it) {
@@ -350,6 +353,13 @@
} else {
deviceConnections[hwAddr][connType].append(connection);
}
+
+ const auto &interface = connection.value("IfcName").toString();
+ if (interface.isEmpty()) {
+ wiredCommonConnections[connType].append(connection);
+ } else {
+ wiredDeviceConnections[interface][connType].append(connection);
+ }
}
}
@@ -357,12 +367,14 @@
for (NetworkDevice *dev : m_devices) {
const QString &hwAddr = dev->realHwAdr();
const QMap<QString, QList<QJsonObject>> &connsByType =
deviceConnections.value(hwAddr);
+ const QString &inter = dev->interfaceName();
+ const QMap<QString, QList<QJsonObject>> &connsByInter =
wiredDeviceConnections.value(inter);
QList<QJsonObject> destConns;
switch (dev->type()) {
case NetworkDevice::Wired: {
- destConns += commonConnections.value("wired");
- destConns += connsByType.value("wired");
+ destConns += wiredCommonConnections.value("wired");
+ destConns += connsByInter.value("wired");
WiredDevice *wdDevice = static_cast<WiredDevice *>(dev);
wdDevice->setConnections(destConns);
break;
@@ -610,12 +622,12 @@
// if the new connectivity state from NetworkManager is not Full,
// check it again use our urls
- if (m_Connectivity != Full) {
- if (!m_connectivityCheckThread->isRunning()) {
- m_connectivityCheckThread->start();
- }
- Q_EMIT needCheckConnectivitySecondary();
- }
+ // if (m_Connectivity != Full) {
+ // if (!m_connectivityCheckThread->isRunning()) {
+ // m_connectivityCheckThread->start();
+ // }
+ // Q_EMIT needCheckConnectivitySecondary();
+ // }
Q_EMIT connectivityChanged(m_Connectivity);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.9/dde-network-utils/wireddevice.cpp
new/dde-network-utils-5.4.13/dde-network-utils/wireddevice.cpp
--- old/dde-network-utils-5.4.9/dde-network-utils/wireddevice.cpp
2021-05-18 14:54:01.000000000 +0200
+++ new/dde-network-utils-5.4.13/dde-network-utils/wireddevice.cpp
2021-09-02 08:36:07.000000000 +0200
@@ -88,7 +88,9 @@
{
QJsonObject activeWired;
for (const QJsonObject &activeConn : m_activeConnectionsInfo) {
- if (activeConn.value("ConnectionType").toString() == "wired") {
+ // ?????????DSL????????????????????? pppoe
+ if (activeConn.value("ConnectionType").toString() == "wired"
+ || activeConn.value("ConnectionType").toString() == "pppoe") {
activeWired = activeConn;
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-network-utils-5.4.9/tests/test-recoverage.sh
new/dde-network-utils-5.4.13/tests/test-recoverage.sh
--- old/dde-network-utils-5.4.9/tests/test-recoverage.sh 2021-05-18
14:54:01.000000000 +0200
+++ new/dde-network-utils-5.4.13/tests/test-recoverage.sh 2021-09-02
08:36:07.000000000 +0200
@@ -16,7 +16,7 @@
mkdir $BUILD_DIR
cd $BUILD_DIR
qmake ../dde-network-utils/
-make check
+TESTARGS="--gtest_output=xml:dde_test_report_network_utils.xml" make check
-j$(nproc)
lcov -d ./ -c -o coverage_all.info
#lcov --extract coverage_all.info $EXTRACT_ARGS --output-file coverage.info
