Update packages file for version 30440

Signed-off-by: clrbuilder <clrbuilder@intel.com>
pullrebase: skip rebase if current branch is up-to-date
2026-06-17 11:36:24 +00:00 · 2019-07-18 08:02:19 +00:00 · 2019-07-17 12:54:04 -07:00 · 2019-07-17 16:15:58 +00:00 · 2019-07-16 18:03:37 +00:00
2 changed files with 6 additions and 3 deletions
@@ -143,6 +143,10 @@ pullrebase:
 			echo "No commits exist in remote. Continuing."; \
 			exit 0; \
 		fi; \
+		if [ "$$(git rev-list FETCH_HEAD | head -n 1)" = "$$(git rev-list HEAD | head -n 1)" ]; then \
+			echo "Current branch up-to-date. Continuing."; \
+			exit 0; \
+		fi; \
 		echo "Rebasing to origin/master"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
@@ -1310,7 +1310,6 @@ compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
 compat-iptables-soname0.1.0
-compat-ldc-soname84
 compat-libgit2-soname27
 compat-libical-soname2
 compat-libidn-soname11
@@ -2569,7 +2568,6 @@ linux-libc-headers
 linux-lts2017
 linux-lts2018
 linux-mainline
-linux-networktest
 linux-oracle
 linux-preempt-rt
 linux-steam-integration
@@ -2636,7 +2634,6 @@ mariadb
 mash
 materia-theme
 matplotlib
-maven-dep
 mc
 mccabe
 mcelog
@@ -2673,6 +2670,7 @@ mkfontdir
 mkfontscale
 mkl-dnn
 mkosi
+mlocate
 mlt
 mobile-broadband-provider-info
 mock
@@ -4110,6 +4108,7 @@ python-polib
 python-rpm-legacypython
 python-saharaclient
 python-senlinclient
+python-slip
 python-slugify
 python-subunit
 python-swiftclient
Author	SHA1	Message	Date
clrbuilder	70bfbe8c17	Update packages file for version 30440 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2019-07-18 08:02:19 +00:00
Patrick McCarty	3b1e4e5558	pullrebase: skip rebase if current branch is up-to-date Any attempt at rebasing is unnecessary when the current branch is up-to-date with the remote, so skip the rebase in this case. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2019-07-17 12:54:04 -07:00
clrbuilder	2465219907	Update packages file for version 30420 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2019-07-17 16:15:58 +00:00
clrbuilder	77775f060c	Update packages file for version 30410 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2019-07-16 18:03:37 +00:00